Merge pull request #407 from iamniting/rook-deps

Revert "bundle: remove rook as a dependency to allow upgrades from 4.15 to 4.16"
red-hat-storage · May 15, 2024 · 0c42993 · 0c42993
2 parents 5cc0103 + b156aff
commit 0c42993
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/bundle/metadata/dependencies.yaml b/bundle/metadata/dependencies.yaml
@@ -3,6 +3,10 @@ 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 {
 		},
 	}
 
-	_ = &operatorv1alpha1.Subscription{
+	rookSubscription := &operatorv1alpha1.Subscription{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      RookSubscriptionName,
 			Namespace: OperatorNamespace,
@@ -481,7 +481,7 @@ func GetStorageClusterSubscriptions() []*operatorv1alpha1.Subscription {
 		},
 	}
 
-	return []*operatorv1alpha1.Subscription{ocsSubscription, noobaaSubscription,
+	return []*operatorv1alpha1.Subscription{ocsSubscription, rookSubscription, noobaaSubscription,
 		csiAddonsSubscription, ocsClientSubscription, prometheusSubscription, recipeSubscription}
 }