makefile: update bundle images

Signed-off-by: Nitin Goyal <nigoyal@redhat.com>
red-hat-storage · Aug 30, 2024 · 898355c · 898355c
1 parent fec1ac2
commit 898355c
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 60 deletions.
diff --git a/catalog/cephcsi.yaml b/catalog/cephcsi.yaml
diff --git a/catalog/ocs-client.yaml b/catalog/ocs-client.yaml
diff --git a/catalog/ocs.yaml b/catalog/ocs.yaml
diff --git a/catalog/rook.yaml b/catalog/rook.yaml
diff --git a/hack/install-odf.sh b/hack/install-odf.sh
@@ -31,9 +31,9 @@ oc wait --timeout=5m --for jsonpath='{.status.phase}'=Succeeded -n "$INSTALL_NAM
 }
 
 oc wait --timeout=5m --for condition=Available -n "$INSTALL_NAMESPACE" deployment \
+    ceph-csi-controller-manager \
     csi-addons-controller-manager \
     noobaa-operator \
-    ocscsi-controller-manager \
     ocs-client-operator-console \
     ocs-client-operator-controller-manager \
     ocs-operator \

diff --git a/hack/make-bundle-vars.mk b/hack/make-bundle-vars.mk
@@ -74,14 +74,14 @@ CRD_OPTIONS ?= "crd"
 OCS_BUNDLE_NAME ?= ocs-operator
 OCS_BUNDLE_IMG_NAME ?= $(OCS_BUNDLE_NAME)-bundle
 OCS_BUNDLE_VERSION ?= v4.17.0
-OCS_BUNDLE_IMG_TAG ?= main-b18b234
+OCS_BUNDLE_IMG_TAG ?= release-4.17-772eb9c
 OCS_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev
 OCS_BUNDLE_IMG ?= $(OCS_BUNDLE_IMG_LOCATION)/$(OCS_BUNDLE_IMG_NAME):$(OCS_BUNDLE_IMG_TAG)
 
 OCS_CLIENT_BUNDLE_NAME ?= ocs-client-operator
 OCS_CLIENT_BUNDLE_IMG_NAME ?= $(OCS_CLIENT_BUNDLE_NAME)-bundle
 OCS_CLIENT_BUNDLE_VERSION ?= v4.17.0
-OCS_CLIENT_BUNDLE_IMG_TAG ?= main-1e930
+OCS_CLIENT_BUNDLE_IMG_TAG ?= main-5595a28
 OCS_CLIENT_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev
 OCS_CLIENT_BUNDLE_IMG ?= $(OCS_CLIENT_BUNDLE_IMG_LOCATION)/$(OCS_CLIENT_BUNDLE_IMG_NAME):$(OCS_CLIENT_BUNDLE_IMG_TAG)
 
@@ -102,7 +102,7 @@ CSIADDONS_BUNDLE_IMG ?= $(CSIADDONS_BUNDLE_IMG_LOCATION)/$(CSIADDONS_BUNDLE_IMG_
 CEPHCSI_BUNDLE_NAME ?= cephcsi-operator
 CEPHCSI_BUNDLE_IMG_NAME ?= $(CEPHCSI_BUNDLE_NAME)-bundle
 CEPHCSI_BUNDLE_VERSION ?= v4.17.0
-CEPHCSI_BUNDLE_IMG_TAG ?= main-ecba5f6
+CEPHCSI_BUNDLE_IMG_TAG ?= release-4.17-fb535da
 CEPHCSI_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev
 CEPHCSI_BUNDLE_IMG ?= $(CEPHCSI_BUNDLE_IMG_LOCATION)/$(CEPHCSI_BUNDLE_IMG_NAME):$(CEPHCSI_BUNDLE_IMG_TAG)
 
@@ -121,7 +121,7 @@ ODF_CONSOLE_IMG ?= $(ODF_CONSOLE_IMG_LOCATION)/$(ODF_CONSOLE_IMG_NAME):$(ODF_CON
 ROOK_BUNDLE_NAME ?= rook-ceph-operator
 ROOK_BUNDLE_IMG_NAME ?= $(ROOK_BUNDLE_NAME)-bundle
 ROOK_BUNDLE_VERSION ?= v4.17.0
-ROOK_BUNDLE_IMG_TAG ?= master-75180f4f3
+ROOK_BUNDLE_IMG_TAG ?= release-4.17-91cc5780b
 ROOK_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev
 ROOK_BUNDLE_IMG ?= $(ROOK_BUNDLE_IMG_LOCATION)/$(ROOK_BUNDLE_IMG_NAME):$(ROOK_BUNDLE_IMG_TAG)