DFBUGS-2587: [release-4.18] upgrade noobaa along with client-operator

bundle/manifests/ocs-client-operator.clusterserviceversion.yaml

@@ -7,7 +7,7 @@ metadata:
     categories: Storage
     console.openshift.io/plugins: '["odf-client-console"]'
     containerImage: quay.io/ocs-dev/ocs-client-operator:latest
-    createdAt: "2024-11-27T03:54:42Z"
+    createdAt: "2025-05-21T07:43:34Z"
     description: OpenShift Data Foundation client operator enables consumption of
       storage services from a remote centralized OpenShift Data Foundation provider
       cluster.
@@ -517,8 +517,6 @@ spec:
                       fieldPath: metadata.name
                 - name: STATUS_REPORTER_IMAGE
                   value: quay.io/ocs-dev/ocs-client-operator:latest
-                - name: NOOBAA_OPERATOR_CHANNEL
-                  value: stable-4.17
                 image: quay.io/ocs-dev/ocs-client-operator:latest
                 livenessProbe:
                   httpGet:

config/manager/manager.yaml

@@ -60,8 +60,6 @@ spec:
               fieldPath: metadata.name
         - name: STATUS_REPORTER_IMAGE
           value: STATUS_REPORTER_IMAGE_VALUE
-        - name: NOOBAA_OPERATOR_CHANNEL
-          value: stable-4.17
         securityContext:
           allowPrivilegeEscalation: false
         livenessProbe:

internal/controller/operatorconfigmap_controller.go

@@ -526,17 +526,15 @@ func (c *OperatorConfigMapReconciler) ensureConsolePlugin() error {
 func (c *OperatorConfigMapReconciler) getNoobaaSubManagementConfig() bool {
 	valAsString, ok := c.operatorConfigMap.Data[manageNoobaaSubKey]
 	if !ok {
-		//while feature in dev preview returning false to disable feature by default.
-		return false
+		return true
 	}
 	val, err := strconv.ParseBool(valAsString)
 	if err != nil {
 		c.log.Error(
 			err,
 			"Unsupported value under manageNoobaaSubscription key",
 		)
-		//while feature in dev preview returning false to disable feature by default.
-		return false
+		return true
 	}
 	return val
 }
@@ -628,15 +626,17 @@ func (c *OperatorConfigMapReconciler) reconcileClientOperatorSubscription() erro
 }
 
 func (c *OperatorConfigMapReconciler) reconcileNoobaaOperatorSubscription() error {
-	noobaaSubscription, err := c.getSubscriptionByPackageName("noobaa-operator")
+	noobaaSubscription, err := c.getSubscriptionByPackageName("mcg-operator")
+	if kerrors.IsNotFound(err) {
+		noobaaSubscription, err = c.getSubscriptionByPackageName("noobaa-operator")
+	}
 	if err != nil {
 		return err
 	}
-	desiredSubChannel := utils.GetNoobaaOperatorChannel()
-	if desiredSubChannel != noobaaSubscription.Spec.Channel {
-		noobaaSubscription.Spec.Channel = desiredSubChannel
+	if c.subscriptionChannel != "" && c.subscriptionChannel != noobaaSubscription.Spec.Channel {
+		noobaaSubscription.Spec.Channel = c.subscriptionChannel
 		if err := c.update(noobaaSubscription); err != nil {
-			return fmt.Errorf("failed to update subscription channel of 'noobaa-operator' to %v: %v", c.subscriptionChannel, err)
+			return fmt.Errorf("failed to update subscription channel of 'mcg-operator' to %v: %v", c.subscriptionChannel, err)
 		}
 	}
 	return nil
@@ -653,7 +653,7 @@ func (c *OperatorConfigMapReconciler) reconcileCSIAddonsOperatorSubscription() e
 	if c.subscriptionChannel != "" && c.subscriptionChannel != addonsSubscription.Spec.Channel {
 		addonsSubscription.Spec.Channel = c.subscriptionChannel
 		if err := c.update(addonsSubscription); err != nil {
-			return fmt.Errorf("failed to update subscription channel of 'csi-addons' to %v: %v", c.subscriptionChannel, err)
+			return fmt.Errorf("failed to update subscription channel of 'odf-csi-addons-operator' to %v: %v", c.subscriptionChannel, err)
 		}
 	}
 	return nil