Merge pull request #348 from rewantsoni/recipe-release-4.18

DFBUGS-2326: [release-4.18] bundle: add recipe op as a dependency

Author: openshift-merge-bot[bot]

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-04-21T13:41:01Z"
     description: OpenShift Data Foundation client operator enables consumption of
       storage services from a remote centralized OpenShift Data Foundation provider
       cluster.

bundle/metadata/dependencies.yaml

@@ -11,3 +11,7 @@ dependencies:
     value:
       packageName: noobaa-operator
       version: ">=5.17.0 <=5.18.0"
+  - type: olm.package
+    value:
+      packageName: recipe
+      version: "0.0.1"

config/metadata/dependencies.yaml

@@ -11,3 +11,7 @@ dependencies:
     value:
       packageName: noobaa-operator
       version: ">=5.17.0 <=5.18.0"
+  - type: olm.package
+    value:
+      packageName: recipe
+      version: "0.0.1"

hack/build-catalog.sh

@@ -7,6 +7,7 @@ mkdir catalog
 
 ${OPM} render --output=yaml ${BUNDLE_IMG} > catalog/ocs-client-bundle.yaml
 ${OPM} render --output=yaml ${CSI_ADDONS_BUNDLE_IMG} > catalog/csi-adddons-bundle.yaml
+${OPM} render --output=yaml ${RECIPE_BUNDLE_IMG} > catalog/recipe.yaml
 ${OPM} render --output=yaml ${NOOBAA_BUNDLE_IMG} > catalog/noobaa-operator-bundle.yaml
 
 cat << EOF >> catalog/index.yaml
@@ -40,6 +41,16 @@ package: noobaa-operator
 name: alpha
 entries:
   - name: $NOOBAA_BUNDLE_NAME.v$NOOBAA_BUNDLE_VERSION
+---
+defaultChannel: alpha
+name: $RECIPE_BUNDLE_NAME
+schema: olm.package
+---
+schema: olm.channel
+package: recipe
+name: alpha
+entries:
+  - name: $RECIPE_BUNDLE_NAME.v$RECIPE_BUNDLE_VERSION
 EOF
 
 ${OPM} validate catalog

hack/make-bundle-vars.mk

@@ -64,6 +64,12 @@ OCS_CLIENT_CONSOLE_IMG_TAG ?= latest
 OCS_CLIENT_CONSOLE_IMG_LOCATION ?= $(IMAGE_REGISTRY)/$(REGISTRY_NAMESPACE)
 OCS_CLIENT_CONSOLE_IMG ?= $(OCS_CLIENT_CONSOLE_IMG_LOCATION)/$(OCS_CLIENT_CONSOLE_IMG_NAME):$(OCS_CLIENT_CONSOLE_IMG_TAG)
 
+RECIPE_BUNDLE_NAME ?= recipe
+RECIPE_REGISTRY_NAMESPACE ?= ramendr
+RECIPE_BUNDLE_IMG_NAME ?= $(RECIPE_BUNDLE_NAME)-bundle
+RECIPE_BUNDLE_VERSION ?= 0.0.1
+RECIPE_BUNDLE_IMG_TAG ?= latest
+
 # IMG defines the image used for the operator.
 IMG ?= $(IMAGE_REGISTRY)/$(REGISTRY_NAMESPACE)/$(IMAGE_NAME):$(IMAGE_TAG)
 
@@ -73,6 +79,8 @@ BUNDLE_IMG ?= $(IMAGE_REGISTRY)/$(REGISTRY_NAMESPACE)/$(BUNDLE_IMAGE_NAME):$(IMA
 CSI_ADDONS_BUNDLE_IMG ?= $(CSI_ADDONS_IMAGE_REGISTRY)/$(CSI_ADDONS_REGISTRY_NAMESPACE)/$(CSI_ADDONS_BUNDLE_IMAGE_NAME):$(CSI_ADDONS_BUNDLE_IMAGE_TAG)
 
 
+RECIPE_BUNDLE_IMG ?= $(IMAGE_REGISTRY)/$(RECIPE_REGISTRY_NAMESPACE)/$(RECIPE_BUNDLE_IMG_NAME):$(RECIPE_BUNDLE_IMG_TAG)
+
 # CATALOG_IMG defines the image used for the catalog.
 CATALOG_IMG ?= $(IMAGE_REGISTRY)/$(REGISTRY_NAMESPACE)/$(CATALOG_IMAGE_NAME):$(IMAGE_TAG)
 

internal/controller/operatorconfigmap_controller.go

@@ -271,6 +271,11 @@ func (c *OperatorConfigMapReconciler) Reconcile(ctx context.Context, req ctrl.Re
 			return ctrl.Result{}, err
 		}
 
+		if err := c.reconcileRecipeOperatorSubscription(); err != nil {
+			c.log.Error(err, "unable to reconcile Recipe Operator subscription")
+			return ctrl.Result{}, err
+		}
+
 		if err := c.ensureConsolePlugin(); err != nil {
 			c.log.Error(err, "unable to deploy client console")
 			return ctrl.Result{}, err
@@ -676,6 +681,20 @@ func (c *OperatorConfigMapReconciler) reconcileCephCSIOperatorSubscription() err
 	return nil
 }
 
+func (c *OperatorConfigMapReconciler) reconcileRecipeOperatorSubscription() error {
+	recipeOperatorSubscription, err := c.getSubscriptionByPackageName("recipe")
+	if err != nil {
+		return err
+	}
+	if c.subscriptionChannel != "" && c.subscriptionChannel != recipeOperatorSubscription.Spec.Channel {
+		recipeOperatorSubscription.Spec.Channel = c.subscriptionChannel
+		if err := c.update(recipeOperatorSubscription); err != nil {
+			return fmt.Errorf("failed to update subscription channel of 'recipe' to %v: %v", c.subscriptionChannel, err)
+		}
+	}
+	return nil
+}
+
 func (c *OperatorConfigMapReconciler) reconcileWebhookService() error {
 	svc := &corev1.Service{}
 	svc.Name = templates.WebhookServiceName