From 875617b1674e32df2a0ecf598518a1f3e64243bb Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Thu, 9 May 2024 12:32:07 +0200 Subject: [PATCH 1/2] Add RHEL-9.4 imagestreams Signed-off-by: Petr "Stone" Hracek --- imagestreams/imagestreams.yaml | 10 +++++----- imagestreams/mariadb-centos.json | 18 ++++++++++++++++++ imagestreams/mariadb-rhel-aarch64.json | 26 ++++++++++++++++++++++---- imagestreams/mariadb-rhel.json | 26 ++++++++++++++++++++++---- 4 files changed, 67 insertions(+), 13 deletions(-) diff --git a/imagestreams/imagestreams.yaml b/imagestreams/imagestreams.yaml index 0090803..37d26d9 100644 --- a/imagestreams/imagestreams.yaml +++ b/imagestreams/imagestreams.yaml @@ -15,10 +15,10 @@ app_versions: ["10.3", "10.5"] - name: CentOS Stream 9 - app_versions: ["10.5"] + app_versions: ["10.5", "10.11"] - filename: mariadb-rhel.json - latest: "10.5-el8" + latest: "10.11-el9" distros: - name: RHEL 7 app_versions: ["10.3", "10.5"] @@ -27,13 +27,13 @@ app_versions: ["10.3", "10.5"] - name: RHEL 9 - app_versions: ["10.5"] + app_versions: ["10.5", "10.11"] - filename: mariadb-rhel-aarch64.json - latest: "10.5-el8" + latest: "10.11-el9" distros: - name: RHEL 8 app_versions: ["10.3", "10.5"] - name: RHEL 9 - app_versions: ["10.5"] + app_versions: ["10.5", "10.11"] diff --git a/imagestreams/mariadb-centos.json b/imagestreams/mariadb-centos.json index cc5484b..b6ac722 100644 --- a/imagestreams/mariadb-centos.json +++ b/imagestreams/mariadb-centos.json @@ -63,6 +63,24 @@ "type": "Local" } }, + { + "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": "latest", "annotations": { diff --git a/imagestreams/mariadb-rhel-aarch64.json b/imagestreams/mariadb-rhel-aarch64.json index a843a57..4bc3c89 100644 --- a/imagestreams/mariadb-rhel-aarch64.json +++ b/imagestreams/mariadb-rhel-aarch64.json @@ -63,19 +63,37 @@ "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" + } + }, { "name": "latest", "annotations": { - "openshift.io/display-name": "MariaDB 10.5 (Latest)", + "openshift.io/display-name": "MariaDB 10.11 (Latest)", "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.5/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", + "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.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", "iconClass": "icon-mariadb", "tags": "database,mariadb", - "version": "10.5" + "version": "10.11" }, "from": { "kind": "ImageStreamTag", - "name": "10.5-el8" + "name": "10.11-el9" }, "referencePolicy": { "type": "Local" diff --git a/imagestreams/mariadb-rhel.json b/imagestreams/mariadb-rhel.json index 7bce1f7..0b24b38 100644 --- a/imagestreams/mariadb-rhel.json +++ b/imagestreams/mariadb-rhel.json @@ -99,19 +99,37 @@ "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" + } + }, { "name": "latest", "annotations": { - "openshift.io/display-name": "MariaDB 10.5 (Latest)", + "openshift.io/display-name": "MariaDB 10.11 (Latest)", "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.5/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", + "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.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", "iconClass": "icon-mariadb", "tags": "database,mariadb", - "version": "10.5" + "version": "10.11" }, "from": { "kind": "ImageStreamTag", - "name": "10.5-el8" + "name": "10.11-el9" }, "referencePolicy": { "type": "Local" From 16fc4327825e34c9e09b5f35c1930ebd6b436593 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Mon, 13 May 2024 14:16:30 +0200 Subject: [PATCH 2/2] Use latest 11-el9 also to CentOS Stream 9 Signed-off-by: Petr "Stone" Hracek --- imagestreams/imagestreams.yaml | 2 +- imagestreams/mariadb-centos.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/imagestreams/imagestreams.yaml b/imagestreams/imagestreams.yaml index 37d26d9..6ea968a 100644 --- a/imagestreams/imagestreams.yaml +++ b/imagestreams/imagestreams.yaml @@ -9,7 +9,7 @@ https://github.com/sclorg/mariadb-container/tree/master/APP_VERSION/README.md. imagestream_files: - filename: mariadb-centos.json - latest: "10.5-el9" + latest: "10.11-el9" distros: - name: CentOS Stream 8 app_versions: ["10.3", "10.5"] diff --git a/imagestreams/mariadb-centos.json b/imagestreams/mariadb-centos.json index b6ac722..107c3d4 100644 --- a/imagestreams/mariadb-centos.json +++ b/imagestreams/mariadb-centos.json @@ -84,16 +84,16 @@ { "name": "latest", "annotations": { - "openshift.io/display-name": "MariaDB 10.5 (Latest)", + "openshift.io/display-name": "MariaDB 10.11 (Latest)", "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.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", + "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.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n", "iconClass": "icon-mariadb", "tags": "database,mariadb", - "version": "10.5" + "version": "10.11" }, "from": { "kind": "ImageStreamTag", - "name": "10.5-el9" + "name": "10.11-el9" }, "referencePolicy": { "type": "Local"