bundle: remove rook as a dependency to allow upgrades from 4.15 to 4.16

In older clusters, upgrading the odf channel from 4.15 to 4.16 tries to
bring the rook-operator, leading to conflicts with ocs-operator 4.15,
which already contains all Rook components in its 4.15 CSV. This
conflict results in upgrade failures.

To address this issue, the Rook dependency is removed from the
odf-operator and added to the ocs-operator. This solution ensures a
smooth upgrade process, as changing the ocs-operator channel will now
bring Rook along with ocs-operator 4.16 without encountering conflicts.

This commit should be reverted in 4.17 as 4.16 will feature different
CSVs. In 4.17, reintroducing Rook as a dependency in odf should
facilitate smooth installations and upgrades.

Signed-off-by: Nitin Goyal <[email protected]>

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

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}
 }