Merge pull request #400 from iamniting/release-4.16

Bug 2275456:[release-4.16] bundle: remove rook as a dependency to allow upgrades from 4.15 to 4.16
red-hat-storage · Apr 18, 2024 · 46a0302 · 46a0302
2 parents e2bd990 + 54a25d0
commit 46a0302
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/bundle/metadata/dependencies.yaml b/bundle/metadata/dependencies.yaml
@@ -3,10 +3,6 @@ dependencies:
   value:
     packageName: ocs-operator
     version: ">=4.15.0 <=4.16.0"
-- type: olm.package
-  value:
-    packageName: rook-ceph-operator
-    version: ">=4.15.0 <=4.16.0"
 - type: olm.package
   value:
     packageName: ocs-client-operator

diff --git a/controllers/subscriptions.go b/controllers/subscriptions.go
@@ -436,7 +436,7 @@ func GetStorageClusterSubscriptions() []*operatorv1alpha1.Subscription {
 		},
 	}
 
-	rookSubscription := &operatorv1alpha1.Subscription{
+	_ = &operatorv1alpha1.Subscription{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      RookSubscriptionName,
 			Namespace: OperatorNamespace,
@@ -466,7 +466,7 @@ func GetStorageClusterSubscriptions() []*operatorv1alpha1.Subscription {
 		},
 	}
 
-	return []*operatorv1alpha1.Subscription{ocsSubscription, rookSubscription, noobaaSubscription,
+	return []*operatorv1alpha1.Subscription{ocsSubscription, noobaaSubscription,
 		csiAddonsSubscription, ocsClientSubscription, prometheusSubscription}
 }
 

diff --git a/hack/make-bundle-vars.mk b/hack/make-bundle-vars.mk
@@ -70,7 +70,7 @@ CRD_OPTIONS ?= "crd"
 OCS_BUNDLE_NAME ?= ocs-operator
 OCS_BUNDLE_IMG_NAME ?= $(OCS_BUNDLE_NAME)-bundle
 OCS_BUNDLE_VERSION ?= v4.16.0
-OCS_BUNDLE_IMG_TAG ?= main-0c259e6
+OCS_BUNDLE_IMG_TAG ?= release-4.16-723d642
 OCS_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev
 OCS_BUNDLE_IMG ?= $(OCS_BUNDLE_IMG_LOCATION)/$(OCS_BUNDLE_IMG_NAME):$(OCS_BUNDLE_IMG_TAG)
 
@@ -110,7 +110,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.16.0
-ROOK_BUNDLE_IMG_TAG ?= master-9e5499216
+ROOK_BUNDLE_IMG_TAG ?= master-f8e5f814c
 ROOK_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev
 ROOK_BUNDLE_IMG ?= $(ROOK_BUNDLE_IMG_LOCATION)/$(ROOK_BUNDLE_IMG_NAME):$(ROOK_BUNDLE_IMG_TAG)