From 806ff5a5acaf42b7dfafb47abd53ee91c3694db0 Mon Sep 17 00:00:00 2001 From: Nitin Goyal Date: Wed, 13 Nov 2024 18:47:44 +0530 Subject: [PATCH 1/2] update rook and noobaa images Signed-off-by: Nitin Goyal --- .../manifests/ocs-operator.clusterserviceversion.yaml | 6 +++--- hack/common.sh | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml b/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml index 33c736da7a..f2e60e68ce 100644 --- a/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml +++ b/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml @@ -561,11 +561,11 @@ spec: - name: OCS_METRICS_EXPORTER_IMAGE value: quay.io/ocs-dev/ocs-metrics-exporter:latest - name: ROOK_CEPH_IMAGE - value: quay.io/ocs-dev/rook-ceph:vmaster-c455c6812 + value: quay.io/ocs-dev/rook-ceph:vmaster-793bbb006 - name: CEPH_IMAGE value: quay.io/ceph/ceph:v18.2.0 - name: NOOBAA_CORE_IMAGE - value: quay.io/noobaa/noobaa-core:master-20240901 + value: quay.io/noobaa/noobaa-core:master-20241111 - name: NOOBAA_DB_IMAGE value: quay.io/sclorg/postgresql-15-c9s - name: PROVIDER_API_SERVER_IMAGE @@ -722,7 +722,7 @@ spec: provider: name: Red Hat relatedImages: - - image: quay.io/ocs-dev/rook-ceph:vmaster-c455c6812 + - image: quay.io/ocs-dev/rook-ceph:vmaster-793bbb006 name: rook-container - image: quay.io/ceph/ceph:v18.2.0 name: ceph-container diff --git a/hack/common.sh b/hack/common.sh index d32ec515d9..3c08387473 100644 --- a/hack/common.sh +++ b/hack/common.sh @@ -49,8 +49,8 @@ OCS_CSV="$OUTDIR_TEMPLATES/ocs-operator.csv.yaml.in" # We are using rook dowsntream image now, i.e, red-hat-storage/rook code # and we should continue to use dowsntream image only due to few # downstream only changes present in rook downstream fork. -LATEST_ROOK_IMAGE="quay.io/ocs-dev/rook-ceph:vmaster-c455c6812" -LATEST_NOOBAA_CORE_IMAGE="quay.io/noobaa/noobaa-core:master-20240901" +LATEST_ROOK_IMAGE="quay.io/ocs-dev/rook-ceph:vmaster-793bbb006" +LATEST_NOOBAA_CORE_IMAGE="quay.io/noobaa/noobaa-core:master-20241111" LATEST_NOOBAA_DB_IMAGE="quay.io/sclorg/postgresql-15-c9s" LATEST_CEPH_IMAGE="quay.io/ceph/ceph:v18.2.0" # TODO: change image once the quay repo is changed @@ -90,8 +90,8 @@ UX_BACKEND_OAUTH_FULL_IMAGE_NAME="${UX_BACKEND_OAUTH_FULL_IMAGE_NAME:-${DEFAULT_ CEPH_CSI_BUNDLE_FULL_IMAGE_NAME="quay.io/ocs-dev/cephcsi-operator-bundle:release-4.17-fb535da" OCS_CLIENT_BUNDLE_FULL_IMAGE_NAME="quay.io/ocs-dev/ocs-client-operator-bundle:main-5595a28" -NOOBAA_BUNDLE_FULL_IMAGE_NAME="quay.io/noobaa/noobaa-operator-bundle:master-20240901" -ROOK_BUNDLE_FULL_IMAGE_NAME="quay.io/ocs-dev/rook-ceph-operator-bundle:master-c455c6812" +NOOBAA_BUNDLE_FULL_IMAGE_NAME="quay.io/noobaa/noobaa-operator-bundle:master-20241111" +ROOK_BUNDLE_FULL_IMAGE_NAME="quay.io/ocs-dev/rook-ceph-operator-bundle:master-793bbb006" KUBE_RBAC_PROXY_FULL_IMAGE_NAME="gcr.io/kubebuilder/kube-rbac-proxy:v0.13.0" OCS_OPERATOR_INSTALL="${OCS_OPERATOR_INSTALL:-false}" From 635815d629e03880720d26b95a3bee8290274cbd Mon Sep 17 00:00:00 2001 From: Nitin Goyal Date: Wed, 13 Nov 2024 18:48:04 +0530 Subject: [PATCH 2/2] update catalog index file Signed-off-by: Nitin Goyal --- catalog/index.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catalog/index.yaml b/catalog/index.yaml index 6a075be608..8711a7c9b1 100644 --- a/catalog/index.yaml +++ b/catalog/index.yaml @@ -18,7 +18,7 @@ schema: olm.channel package: rook-ceph-operator name: alpha entries: - - name: rook-ceph-operator.v4.17.0 + - name: rook-ceph-operator.v4.18.0 --- defaultChannel: alpha @@ -29,4 +29,4 @@ schema: olm.channel package: noobaa-operator name: alpha entries: - - name: noobaa-operator.v5.17.0 + - name: noobaa-operator.v5.18.0