From d76caa4d874794317cbee309277e0e402182905d Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Thu, 1 Aug 2024 09:51:38 +0200 Subject: [PATCH 1/2] Update imagestreams for HTTPD, MariaDB, and MySQL Signed-off-by: Petr "Stone" Hracek --- .../src/templates/imagestreams.yaml | 25 ++++++- .../src/templates/imagestreams.yaml | 70 ++++++++++++++++++- .../src/templates/imagestreams.yaml | 12 ++-- .../src/templates/imagestreams.yaml | 19 +++++ .../src/templates/imagestreams.yaml | 32 +++++++++ tests/test_httpd_imagestreams.py | 4 +- tests/test_mariadb_imagestreams.py | 8 ++- tests/test_mysql_imagestreams.py | 2 +- 8 files changed, 157 insertions(+), 15 deletions(-) diff --git a/charts/centos/httpd-imagestreams/src/templates/imagestreams.yaml b/charts/centos/httpd-imagestreams/src/templates/imagestreams.yaml index f9442c8..1fbd5ef 100644 --- a/charts/centos/httpd-imagestreams/src/templates/imagestreams.yaml +++ b/charts/centos/httpd-imagestreams/src/templates/imagestreams.yaml @@ -67,6 +67,25 @@ spec: referencePolicy: type: Local name: 2.4-ubi8 + - annotations: + description: >- + Build and serve static content via Apache HTTP Server (httpd) 2.4 on + CentOS 8. For more information about using this builder image, + including OpenShift considerations, see + https://github.com/sclorg/httpd-container/blob/master/2.4/README.md. + iconClass: icon-apache + openshift.io/display-name: Apache HTTP Server 2.4 (CentOS Stream 8) + openshift.io/provider-display-name: Red Hat, Inc. + sampleRepo: https://github.com/sclorg/httpd-ex.git + supports: httpd + tags: builder,httpd,hidden + version: "2.4" + from: + kind: DockerImage + name: quay.io/sclorg/httpd-24-c8s:latest + referencePolicy: + type: Local + name: 2.4-el8 - annotations: description: >- Build and serve static content via Apache HTTP Server (httpd) 2.4 on @@ -74,7 +93,7 @@ spec: including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md. iconClass: icon-apache - openshift.io/display-name: Apache HTTP Server 2.4 (CentOS 8) + openshift.io/display-name: Apache HTTP Server 2.4 (CentOS Stream 9) openshift.io/provider-display-name: Red Hat, Inc. sampleRepo: https://github.com/sclorg/httpd-ex.git supports: httpd @@ -82,7 +101,7 @@ spec: version: "2.4" from: kind: DockerImage - name: docker.io/centos/httpd-24-centos8:latest + name: quay.io/sclorg/httpd-24-c9s:latest referencePolicy: type: Local - name: 2.4-el8 + name: 2.4-el9 diff --git a/charts/centos/mariadb-imagestreams/src/templates/imagestreams.yaml b/charts/centos/mariadb-imagestreams/src/templates/imagestreams.yaml index 176b890..51c2695 100644 --- a/charts/centos/mariadb-imagestreams/src/templates/imagestreams.yaml +++ b/charts/centos/mariadb-imagestreams/src/templates/imagestreams.yaml @@ -6,19 +6,83 @@ metadata: openshift.io/display-name: MariaDB spec: tags: + - name: 10.11-el9 + annotations: + openshift.io/display-name: MariaDB 10.11 (CentOS Stream 9) + openshift.io/provider-display-name: Red Hat, Inc. + description: >- + Provides a MariaDB 10.11 database on CentOS Stream 9. For more information about + using this database image, including OpenShift considerations, see + https://github.com/sclorg/mariadb-container/tree/master/10.11/README.md. + iconClass: icon-mariadb + tags: database,mariadb + version: "10.11" + from: + kind: DockerImage + name: quay.io/sclorg/mariadb-1011-c9s:latest + referencePolicy: + type: Local + - name: 10.11-el8 + annotations: + openshift.io/display-name: MariaDB 10.11 (CentOS Stream 8) + openshift.io/provider-display-name: Red Hat, Inc. + description: >- + Provides a MariaDB 10.11 database on CentOS Stream 8. For more information about + using this database image, including OpenShift considerations, see + https://github.com/sclorg/mariadb-container/tree/master/10.11/README.md. + iconClass: icon-mariadb + tags: database,mariadb + version: "10.11" + from: + kind: DockerImage + name: quay.io/sclorg/mariadb-1011-c8s:latest + referencePolicy: + type: Local + - name: 10.5-el9 + annotations: + openshift.io/display-name: MariaDB 10.5 (CentOS Stream 9) + openshift.io/provider-display-name: Red Hat, Inc. + description: >- + Provides a MariaDB 10.5 database on CentOS Stream 9. For more information about + using this database image, including OpenShift considerations, see + https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md. + iconClass: icon-mariadb + tags: database,mariadb + version: "10.5" + from: + kind: DockerImage + name: quay.io/sclorg/mariadb-105-c9s:latest + referencePolicy: + type: Local + - name: 10.5-el8 + annotations: + openshift.io/display-name: MariaDB 10.5 (CentOS Stream 8) + openshift.io/provider-display-name: Red Hat, Inc. + description: >- + Provides a MariaDB 10.5 database on CentOS Stream 8. For more information about + using this database image, including OpenShift considerations, see + https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md. + iconClass: icon-mariadb + tags: database,mariadb + version: "10.5" + from: + kind: DockerImage + name: quay.io/sclorg/mariadb-105-c8s:latest + referencePolicy: + type: Local - name: 10.3-el8 annotations: openshift.io/display-name: MariaDB 10.3 (CentOS 8) openshift.io/provider-display-name: Red Hat, Inc. description: >- - Provides a MariaDB 10.3 database on CentOS 8. For more information about - using this database image, including OpenShift considerations, see + Provides a MariaDB 10.3 database on CentOS 8. For more information about + using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md. iconClass: icon-mariadb tags: database,mariadb version: "10.3" from: kind: DockerImage - name: docker.io/centos/mariadb-103-centos8:latest + name: quay.io/sclorg/mariadb-103-c8s:latest referencePolicy: type: Local diff --git a/charts/centos/mysql-imagestreams/src/templates/imagestreams.yaml b/charts/centos/mysql-imagestreams/src/templates/imagestreams.yaml index c132c5c..cbed1e6 100644 --- a/charts/centos/mysql-imagestreams/src/templates/imagestreams.yaml +++ b/charts/centos/mysql-imagestreams/src/templates/imagestreams.yaml @@ -11,8 +11,8 @@ spec: openshift.io/display-name: MySQL (Latest) openshift.io/provider-display-name: Red Hat, Inc. description: >- - Provides a MySQL database on CentOS. For more information about using - this database image, including OpenShift considerations, see + Provides a MySQL database on CentOS. For more information about using + this database image, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/README.md. WARNING: By selecting this tag, your application will automatically update to use the latest version of MySQL available on OpenShift, including major version updates. @@ -25,17 +25,17 @@ spec: type: Local - name: 8.0-el8 annotations: - openshift.io/display-name: MySQL 8.0 (CentOS 8) + openshift.io/display-name: MySQL 8.0 (CentOS Stream 8) openshift.io/provider-display-name: Red Hat, Inc. description: >- - Provides a MySQL 8.0 database on CentOS 8. For more information about - using this database image, including OpenShift considerations, see + Provides a MySQL 8.0 database on CentOS Stream 8. For more information about + using this database image, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/README.md. iconClass: icon-mysql-database tags: mysql version: "8.0" from: kind: DockerImage - name: docker.io/centos/mysql-80-centos8:latest + name: quay.io/sclorg/mysql-80-c8s:latest referencePolicy: type: Local diff --git a/charts/redhat/httpd-imagestreams/src/templates/imagestreams.yaml b/charts/redhat/httpd-imagestreams/src/templates/imagestreams.yaml index 224ed75..14a287a 100644 --- a/charts/redhat/httpd-imagestreams/src/templates/imagestreams.yaml +++ b/charts/redhat/httpd-imagestreams/src/templates/imagestreams.yaml @@ -86,3 +86,22 @@ spec: referencePolicy: type: Local name: 2.4-el8 + - annotations: + description: >- + Build and serve static content via Apache HTTP Server (httpd) 2.4 on + RHEL 8. For more information about using this builder image, including + OpenShift considerations, see + https://github.com/sclorg/httpd-container/blob/master/2.4/README.md. + iconClass: icon-apache + openshift.io/display-name: Apache HTTP Server 2.4 (RHEL 9) + openshift.io/provider-display-name: 'Red Hat, Inc.' + sampleRepo: 'https://github.com/sclorg/httpd-ex.git' + supports: httpd + tags: 'builder,httpd,hidden' + version: '2.4' + from: + kind: DockerImage + name: registry.redhat.io/rhel9/httpd-24 + referencePolicy: + type: Local + name: 2.4-el9 diff --git a/charts/redhat/mariadb-imagestreams/src/templates/imagestreams.yaml b/charts/redhat/mariadb-imagestreams/src/templates/imagestreams.yaml index ab98fbe..7eac817 100644 --- a/charts/redhat/mariadb-imagestreams/src/templates/imagestreams.yaml +++ b/charts/redhat/mariadb-imagestreams/src/templates/imagestreams.yaml @@ -74,3 +74,35 @@ spec: name: 'registry.redhat.io/rhel9/mariadb-105:latest' referencePolicy: type: Local + - name: 10.11-el8 + annotations: + openshift.io/display-name: MariaDB 10.11 (RHEL 8) + openshift.io/provider-display-name: 'Red Hat, Inc.' + description: >- + Provides a MariaDB 10.5 database on RHEL 8. For more information about + using this database image, including OpenShift considerations, see + https://github.com/sclorg/mariadb-container/tree/master/10.11/README.md. + iconClass: icon-mariadb + tags: 'database,mariadb' + version: '10.11' + from: + kind: DockerImage + name: 'registry.redhat.io/rhel8/mariadb-1011:latest' + referencePolicy: + type: Local + - name: 10.11-el9 + annotations: + openshift.io/display-name: MariaDB 10.11 (RHEL 9) + openshift.io/provider-display-name: 'Red Hat, Inc.' + description: >- + Provides a MariaDB 10.11 database on RHEL 9. For more information about + using this database image, including OpenShift considerations, see + https://github.com/sclorg/mariadb-container/tree/master/10.11/README.md. + iconClass: icon-mariadb + tags: 'database,mariadb' + version: '10.11' + from: + kind: DockerImage + name: 'registry.redhat.io/rhel9/mariadb-1011:latest' + referencePolicy: + type: Local \ No newline at end of file diff --git a/tests/test_httpd_imagestreams.py b/tests/test_httpd_imagestreams.py index a7c0f05..c547324 100644 --- a/tests/test_httpd_imagestreams.py +++ b/tests/test_httpd_imagestreams.py @@ -24,6 +24,7 @@ def teardown_method(self): ("2.4-ubi9", "registry.redhat.io/ubi9/httpd-24:latest"), ("2.4-ubi8", "registry.redhat.io/ubi8/httpd-24:latest"), ("2.4-el8", "registry.redhat.io/rhel8/httpd-24"), + ("2.4-el9", "registry.redhat.io/rhel9/httpd-24"), ], ) def test_package_imagestream(self, version, registry): @@ -47,7 +48,8 @@ def teardown_method(self): [ ("2.4-ubi9", "registry.access.redhat.com/ubi9/httpd-24:latest"), ("2.4-ubi8", "registry.access.redhat.com/ubi8/httpd-24:latest"), - ("2.4-el8", "docker.io/centos/httpd-24-centos8:latest"), + ("2.4-el8", "quay.io/sclorg/httpd-24-c8s:latest"), + ("2.4-el9", "quay.io/sclorg/httpd-24-c9s:latest"), ] ) def test_package_imagestream(self, version, registry): diff --git a/tests/test_mariadb_imagestreams.py b/tests/test_mariadb_imagestreams.py index 2f53416..0060588 100644 --- a/tests/test_mariadb_imagestreams.py +++ b/tests/test_mariadb_imagestreams.py @@ -21,6 +21,8 @@ def teardown_method(self): @pytest.mark.parametrize( "version,registry", [ + ("10.11-el9", "registry.redhat.io/rhel9/mariadb-1011:latest"), + ("10.11-el8", "registry.redhat.io/rhel8/mariadb-1011:latest"), ("10.5-el9", "registry.redhat.io/rhel9/mariadb-105:latest"), ("10.3-el8", "registry.redhat.io/rhel8/mariadb-103:latest"), ("10.5-el8", "registry.redhat.io/rhel8/mariadb-105:latest"), @@ -45,7 +47,11 @@ def teardown_method(self): @pytest.mark.parametrize( "version,registry", [ - ("10.3-el8", "docker.io/centos/mariadb-103-centos8:latest"), + ("10.3-el8", "quay.io/sclorg/mariadb-103-c8s:latest"), + ("10.5-el8", "quay.io/sclorg/mariadb-105-c8s:latest"), + ("10.5-el9", "quay.io/sclorg/mariadb-105-c9s:latest"), + ("10.11-el8", "quay.io/sclorg/mariadb-1011-c8s:latest"), + ("10.11-el9", "quay.io/sclorg/mariadb-1011-c9s:latest"), ], ) def test_package_imagestream(self, version, registry): diff --git a/tests/test_mysql_imagestreams.py b/tests/test_mysql_imagestreams.py index 1b9aebe..3f322a2 100644 --- a/tests/test_mysql_imagestreams.py +++ b/tests/test_mysql_imagestreams.py @@ -44,7 +44,7 @@ def teardown_method(self): @pytest.mark.parametrize( "version,registry", [ - ("8.0-el8", "docker.io/centos/mysql-80-centos8:latest"), + ("8.0-el8", "quay.io/sclorg/mysql-80-c8s:latest"), ], ) def test_package_imagestream(self, version, registry): From 63b84de83c518392be25144ccc4fe30c0cfa640e Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Thu, 1 Aug 2024 14:53:35 +0200 Subject: [PATCH 2/2] Bump versions Signed-off-by: Petr "Stone" Hracek --- charts/centos/httpd-imagestreams/src/Chart.yaml | 4 ++-- .../centos/mariadb-imagestreams/src/Chart.yaml | 4 ++-- charts/centos/mysql-imagestreams/src/Chart.yaml | 4 ++-- charts/redhat/httpd-imagestreams/src/Chart.yaml | 4 ++-- .../redhat/mariadb-imagestreams/src/Chart.yaml | 4 ++-- charts/redhat/mysql-imagestreams/src/Chart.yaml | 4 ++-- httpd-imagestreams-0.0.3.tgz | Bin 0 -> 1001 bytes mariadb-imagestreams-0.0.3.tgz | Bin 0 -> 991 bytes mysql-imagestreams-0.0.3.tgz | Bin 0 -> 909 bytes 9 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 httpd-imagestreams-0.0.3.tgz create mode 100644 mariadb-imagestreams-0.0.3.tgz create mode 100644 mysql-imagestreams-0.0.3.tgz diff --git a/charts/centos/httpd-imagestreams/src/Chart.yaml b/charts/centos/httpd-imagestreams/src/Chart.yaml index a6bbb9e..e8ef6a8 100644 --- a/charts/centos/httpd-imagestreams/src/Chart.yaml +++ b/charts/centos/httpd-imagestreams/src/Chart.yaml @@ -4,10 +4,10 @@ description: |- annotations: charts.openshift.io/name: CentOS Apache HTTP Server imagestreams (experimental) apiVersion: v2 -appVersion: 0.0.1 +appVersion: 0.0.2 kubeVersion: '>=1.20.0' name: httpd-imagestreams tags: builder,httpd sources: - https://github.com/sclorg/helm-charts -version: 0.0.1 +version: 0.0.2 diff --git a/charts/centos/mariadb-imagestreams/src/Chart.yaml b/charts/centos/mariadb-imagestreams/src/Chart.yaml index f7f8382..f45891e 100644 --- a/charts/centos/mariadb-imagestreams/src/Chart.yaml +++ b/charts/centos/mariadb-imagestreams/src/Chart.yaml @@ -5,10 +5,10 @@ description: |- annotations: charts.openshift.io/name: CentOS MariaDB database service imagestreams (experimental) apiVersion: v2 -appVersion: 0.0.1 +appVersion: 0.0.2 kubeVersion: '>=1.20.0' name: mariadb-imagestreams tags: database,mariadb sources: - https://github.com/sclorg/helm-charts -version: 0.0.1 +version: 0.0.2 diff --git a/charts/centos/mysql-imagestreams/src/Chart.yaml b/charts/centos/mysql-imagestreams/src/Chart.yaml index d09f5fc..5e0f9e0 100644 --- a/charts/centos/mysql-imagestreams/src/Chart.yaml +++ b/charts/centos/mysql-imagestreams/src/Chart.yaml @@ -5,10 +5,10 @@ description: |- annotations: charts.openshift.io/name: CentOS MySQL database service imagestreams (experimental) apiVersion: v2 -appVersion: 0.0.1 +appVersion: 0.0.2 kubeVersion: '>=1.20.0' name: mysql-imagestreams tags: database,mysql sources: - https://github.com/sclorg/helm-charts -version: 0.0.1 +version: 0.0.2 diff --git a/charts/redhat/httpd-imagestreams/src/Chart.yaml b/charts/redhat/httpd-imagestreams/src/Chart.yaml index 2d86673..6bdee16 100644 --- a/charts/redhat/httpd-imagestreams/src/Chart.yaml +++ b/charts/redhat/httpd-imagestreams/src/Chart.yaml @@ -4,10 +4,10 @@ description: |- annotations: charts.openshift.io/name: Red Hat Apache HTTP Server imagestreams (experimental) apiVersion: v2 -appVersion: 0.0.2 +appVersion: 0.0.3 kubeVersion: '>=1.20.0' name: httpd-imagestreams tags: builder,httpd sources: - https://github.com/sclorg/helm-charts -version: 0.0.2 +version: 0.0.3 diff --git a/charts/redhat/mariadb-imagestreams/src/Chart.yaml b/charts/redhat/mariadb-imagestreams/src/Chart.yaml index 451786f..d0c61b8 100644 --- a/charts/redhat/mariadb-imagestreams/src/Chart.yaml +++ b/charts/redhat/mariadb-imagestreams/src/Chart.yaml @@ -5,10 +5,10 @@ description: |- annotations: charts.openshift.io/name: Red Hat MariaDB database service imagestreams (experimental) apiVersion: v2 -appVersion: 0.0.2 +appVersion: 0.0.3 kubeVersion: '>=1.20.0' name: mariadb-imagestreams tags: database,mariadb sources: - https://github.com/sclorg/helm-charts -version: 0.0.2 +version: 0.0.3 diff --git a/charts/redhat/mysql-imagestreams/src/Chart.yaml b/charts/redhat/mysql-imagestreams/src/Chart.yaml index 0f5e3a8..d0c1321 100644 --- a/charts/redhat/mysql-imagestreams/src/Chart.yaml +++ b/charts/redhat/mysql-imagestreams/src/Chart.yaml @@ -5,10 +5,10 @@ description: |- annotations: charts.openshift.io/name: Red Hat MySQL database service imagestreams (experimental) apiVersion: v2 -appVersion: 0.0.2 +appVersion: 0.0.3 kubeVersion: '>=1.20.0' name: mysql-imagestreams tags: database,mysql sources: - https://github.com/sclorg/helm-charts -version: 0.0.2 +version: 0.0.3 diff --git a/httpd-imagestreams-0.0.3.tgz b/httpd-imagestreams-0.0.3.tgz new file mode 100644 index 0000000000000000000000000000000000000000..e9bc0bd37e403e7c2bbd43c88c626014b97f6554 GIT binary patch literal 1001 zcmVDc zVQyr3R8em|NM&qo0PL7uPvbZj$GOg@ICll9b=*u~Aks4u3_J@GJ39h)_u6$%8!wJ+ z*-m%*?N?4pnwD;Nnd#1elyg%sJ;&$m_fJIOy~#(SWHWT$A}d||v0&Dd1uNyjevDE| zPtvshq?B%c()Y=`gK>ItoV=$=dYm56@iC<*2SE39|4yr%XZC=8^Ie<8y%A$dY0tdS z%4HD%53_ef8&s|kQ%{7B6)Q1=JIvvlc{n$W7YNr651-*4?Hnz1w+9aKi$N<&RG!JB zh#B!4S|_y1V4g(GnD$pnD0vs<=(rWe*GCV9aKN?ls5}S?#f&Xg@rM3t{O|>oS;(<+c%uu>-;A)9Uu4ne-G>OS&w_2{rNb0 z6e`c)Cj9NbUWKSc&vNEj5R47|09bR+g)@>ZM$P_jk&eT9|BfPn4kD2=$V0Sx+3TpI z=NAQA6ORw0_8j0M5CTl);KEJdf-i5iWiHr`bU-V(yS}<5oq#)3qjEyczz6MGg4wik z2tsjLn+d9-mt()jM`{PO23QsyLz zIstz_zx#Ca>8A`X7T{1K_ifsq&4#ehl?7&u6uhbKPa!3+%Ii=qXHqUY(JGTOkKlDJ z$i6_RHN(SFjX+P~IwT5g&V*zWiJ`4+^}|lAwoOp7KeTN_G{DGIHUDAgXM!}2set8LF?;SX(ZmE(HRW>X>|C7%!KbaSH@`T z-P8U*oi}1XSX28auc_7L3WR5nKCso!HJK+Q9aR%?x;(ZxMT?5#XDtO^tU~#P!3=IS zXEN&gH{<;gG$tektvca;y|{t1oe%O?jO2f^%b`Vwbz9!(Is>$CF@uDpySDsN^GCGx zu5YaPz~W3eZx_U3Ua-3GY9h{-c_wMrEb-uL8CWuO_9`d{PbfI;G1!K|X^+7(3{Llr z!D)}dE5@Md%NyfhScp7FwO1Ur&|nLcD;&NB1C%`lubzUp_EPj6DLC5`1!ph&w^MJu X_10T&KiK{X00960ubF7z02}}S@}%W$ literal 0 HcmV?d00001 diff --git a/mariadb-imagestreams-0.0.3.tgz b/mariadb-imagestreams-0.0.3.tgz new file mode 100644 index 0000000000000000000000000000000000000000..10cec8b38f4379a40278d35a77ef0efa3b387f83 GIT binary patch literal 991 zcmV<510eh#iwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PL7iZ`(Ey$MdXDac@omTO#c!i3O}c+hl8iv@6nLdp=8Nn+rt> zB<0QDeh}rzvg@Q>Bi9SydvQYOj=Hh#Y5RogvI^^lpyEg-gukNf*W# zW9MgQ{*y7b{mI$c@Pwb8$HNOYJiA~gjK{-xbONlC+rMF@b!bl5v+vqY?u8gCr5!q< zl}!SGwCcPKbwSF`#ngpDM+$RF;EpnQj}AUmz+AnB3>{9;5?C?|krK2Cf>ZjZAR}^8 z4&|!=3-JdTE3`^rF$}OMntxfy!cmZsO^qm=Kl(Bk7E-MoDF?!Wk5z~2L#9D#2c;zt z4upcj=&VdD&k#Nty$~5$zyKb7;}Cw;26Al(gqmuT`}6@Px~$>~H3L_@L6f1+tRDaf zmC7=!9{9Z=^|>lg^`2H_Wa=9B!4kpTxxywltQXYH*fq6*)ul%) zl_hXfwfVDe^Tw|B?cY>`1rKs^SZ$3;FgEs40I;Pe02|Jku!Y3sp!QlV=D-$|RuB7q z!ZBd?Nii}VFsJdy_I_O;YOulukqaws@H?&99r7*wMJ?M zcki!nzpXs2c)K*{dlje^=D%o>Gei$s#90`(1u1C7{PWG-$D5D8CGd6$mL#RF5lx4) zJ}h-<0EXwGVI@SMr%gq1fkNU$`jR#! z=(nP+E0p73+B8AxTWr`oDpIZ9NwhZce-73Ruj=pBv9~Rc4=7BH&es@zHAY`>-OHM& zs-Odsm#bq#Q!=Dd`lO{um+Me&Sx^GEIz_oL3!H_cmj91VLlp*2D;nYQ03+eA-<}J& zd}=b}%rZ2T&C&PM%t>B0 zNpUtx>H+IL1I4%-6yw997{7cJDc zVQyr3R8em|NM&qo0PI%LZ`-yL_Ot$qdvgj{678RpC<1;3x;9$_q+OR3+w++^TU;oT zBPnnC?*~ziEW4Roz(KkJ{$6Agx{tcMkN2@^+#fO)6|Ts6OIW$|ZHd+=4OVjWJYbBm zi}^e}8Dsm;DVxnl)A_~u?2^sqmlq>8J!iAa5wK_4{~&7T(T>>Bd+jIp9|0<*J$j*) z%Oe2Z_TDAhkaDG1`b6kdVMRIIQ33DK!-wYnms=>%;{qLlBfA!yV5lHCqrVJUQIYZ} zUqxuduVkIjDu?wfLSy>BEMdw2qJkW^!uYWCxfBk#R-Tjx;UI8zR1+vPDD9zk1j2(* zV5}}`-bNk$Y}yX zaak8ats;P*4XOLKFzpvQQIPFwHvvZkrT50=X}S`=tQQH_RqD9Zc9nL=tj!9ABAYIx zUZfQ|Pd2@~e)I0bby5{c^iVITug&=N|EI}}C2SmZE%@@RMo!n3lgp#{z~&{%D(*TP zd0e@?PjM0`qxEh(zPBb%csV>V|2OQmya-nugw4X^n7pr&)EEYewzO;fd`?A z9B$f1--kx;OzR+kT{l=yql!GX6Qnha!DNa6_S^(uC$tdGNNnORCJgAv8RG4$VJ?M` zc*7Ya=)=+z#NR>=XSadl)zcBCvkM#VhK@H*H-Q_)lW`xrV^Xicz!BymCDr0Ju7I1cuW1hHKc%9f6~@1JGZs z##wuj`)5hL)BJ&K5Z0ca#+FvXdD|qGiV{QnY)SHJlSan!?);38lU(*plFR-blFLq# jdv?iXM@jB`-*rwn;e-=T*y8U1009607?=Ju02TlMMAgU9 literal 0 HcmV?d00001