controllers: update subscription handling

- Set catalog source name same as odf-operator sub for odf-depedencies
  sub while creating it.
- Skip creation of subscriptions other than odf-depedencies.

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

controllers/subscriptions.go

@@ -91,6 +91,14 @@ func CheckExistingSubscriptions(cli client.Client, desiredSubscription *operator
 				actualSub.Spec.Channel = desiredSubscription.Spec.Channel
 			}
 
+			// Set the catalog source for the odf-dependencies subscription to match that of the odf-operator subscription
+			// This ensures that the odf-dependencies subscription uses the same catalog source across all environments,
+			// including offline and test environments where the catalog name may vary.
+			if actualSub.Spec.Package == OdfDepsSubscriptionPackage && actualSub.CreationTimestamp.IsZero() {
+				actualSub.Spec.CatalogSource = odfSub.Spec.CatalogSource
+				actualSub.Spec.CatalogSourceNamespace = odfSub.Spec.CatalogSourceNamespace
+			}
+
 			if actualSub.Spec.Config == nil && desiredSubscription.Spec.Config == nil {
 				actualSub.Spec.Config = &operatorv1alpha1.SubscriptionConfig{}
 				actualSub.Spec.Config.Tolerations = odfSub.Spec.Config.Tolerations
@@ -210,6 +218,12 @@ func EnsureDesiredSubscription(cli client.Client, desiredSubscription *operatorv
 		return err
 	}
 
+	// Skip creating (only update) subscriptions other than odf-dependencies
+	// It will allow OLM to manage their creation via dependency resolution
+	if desiredSubscription.Spec.Package != OdfDepsSubscriptionPackage && desiredSubscription.CreationTimestamp.IsZero() {
+		return nil
+	}
+
 	// create/update subscription
 	sub := &operatorv1alpha1.Subscription{}
 	sub.ObjectMeta = desiredSubscription.ObjectMeta