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/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/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/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/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/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/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/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/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/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/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 0000000..e9bc0bd Binary files /dev/null and b/httpd-imagestreams-0.0.3.tgz differ diff --git a/mariadb-imagestreams-0.0.3.tgz b/mariadb-imagestreams-0.0.3.tgz new file mode 100644 index 0000000..10cec8b Binary files /dev/null and b/mariadb-imagestreams-0.0.3.tgz differ diff --git a/mysql-imagestreams-0.0.3.tgz b/mysql-imagestreams-0.0.3.tgz new file mode 100644 index 0000000..0c0ca4b Binary files /dev/null and b/mysql-imagestreams-0.0.3.tgz differ 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):