makefile: update scaleUp CR references for CSVs

Scale is introducing a remote cluster model with a client cluster,
where no StorageCluster or CephCluster resources are present locally.
ODF will manage these clusters as CNSA will be brought up via ODF only.

Update the scaleUpOnInstanceOf CR entry points to reference the
appropriate resources for this architecture instead of CephCluster
based triggers, since CephCluster is no longer present. This ensures
the client and related operators are scaled up correctly.

Signed-off-by: Nitin Goyal <nigoyal@redhat.com>

Author: iamniting

bundle/odf-operator/manifests/odf-operator-pkgs-config-4.22.0_v1_configmap.yaml

@@ -5,7 +5,7 @@ data:
     csv: cephcsi-operator.v4.22.0
     pkg: cephcsi-operator
     scaleUpOnInstanceOf:
-      - cephclusters.ceph.rook.io
+      - operatorconfigs.csi.ceph.io
   CNSA: |
     channel: stable-v60.1
     csv: ibm-spectrum-scale-operator.v60.1.0
@@ -23,7 +23,7 @@ data:
     csv: csi-addons.v0.14.0
     pkg: csi-addons
     scaleUpOnInstanceOf:
-      - cephclusters.ceph.rook.io
+      - csiaddonsnodes.csiaddons.openshift.io
   IBM_CSI: |
     channel: stable-v1.12.4
     csv: ibm-block-csi-operator.v1.12.4
@@ -53,7 +53,7 @@ data:
     csv: ocs-client-operator.v4.22.0
     pkg: ocs-client-operator
     scaleUpOnInstanceOf:
-      - cephclusters.ceph.rook.io
+      - storageclients.ocs.openshift.io
   ODF_DEPS: |
     channel: alpha
     csv: odf-dependencies.v4.22.0
@@ -80,7 +80,7 @@ data:
     csv: odf-external-snapshotter-operator.v4.22.0
     pkg: odf-external-snapshotter-operator
     scaleUpOnInstanceOf:
-      - cephclusters.ceph.rook.io
+      - volumegroupsnapshotclasses.groupsnapshot.storage.openshift.io
 kind: ConfigMap
 metadata:
   name: odf-operator-pkgs-config-4.22.0

config/manager/configmap.yaml

@@ -8,19 +8,19 @@ data:
     csv: cephcsi-operator.v4.22.0
     pkg: cephcsi-operator
     scaleUpOnInstanceOf:
-      - cephclusters.ceph.rook.io
+      - operatorconfigs.csi.ceph.io
   CSIADDONS: |
     channel: alpha
     csv: csi-addons.v0.14.0
     pkg: csi-addons
     scaleUpOnInstanceOf:
-      - cephclusters.ceph.rook.io
+      - csiaddonsnodes.csiaddons.openshift.io
   SNAPSHOT_CONTROLLER: |
     channel: alpha
     csv: odf-external-snapshotter-operator.v4.22.0
     pkg: odf-external-snapshotter-operator
     scaleUpOnInstanceOf:
-      - cephclusters.ceph.rook.io
+      - volumegroupsnapshotclasses.groupsnapshot.storage.openshift.io
   IBM_ODF: |
     channel: stable-v1.8
     csv: ibm-storage-odf-operator.v1.8.0
@@ -44,7 +44,7 @@ data:
     csv: ocs-client-operator.v4.22.0
     pkg: ocs-client-operator
     scaleUpOnInstanceOf:
-      - cephclusters.ceph.rook.io
+      - storageclients.ocs.openshift.io
   OCS: |
     channel: alpha
     csv: ocs-operator.v4.22.0

hack/make-files.mk

@@ -38,19 +38,19 @@ data:
     csv: $(CEPHCSI_SUBSCRIPTION_CSVNAME)
     pkg: $(CEPHCSI_SUBSCRIPTION_PACKAGE)
     scaleUpOnInstanceOf:
-      - cephclusters.ceph.rook.io
+      - operatorconfigs.csi.ceph.io
   CSIADDONS: |
     channel: $(CSIADDONS_SUBSCRIPTION_CHANNEL)
     csv: $(CSIADDONS_SUBSCRIPTION_CSVNAME)
     pkg: $(CSIADDONS_SUBSCRIPTION_PACKAGE)
     scaleUpOnInstanceOf:
-      - cephclusters.ceph.rook.io
+      - csiaddonsnodes.csiaddons.openshift.io
   SNAPSHOT_CONTROLLER: |
     channel: $(ODF_SNAPSHOT_CONTROLLER_SUBSCRIPTION_CHANNEL)
     csv: $(ODF_SNAPSHOT_CONTROLLER_SUBSCRIPTION_CSVNAME)
     pkg: $(ODF_SNAPSHOT_CONTROLLER_SUBSCRIPTION_PACKAGE)
     scaleUpOnInstanceOf:
-      - cephclusters.ceph.rook.io
+      - volumegroupsnapshotclasses.groupsnapshot.storage.openshift.io
   IBM_ODF: |
     channel: $(IBM_ODF_SUBSCRIPTION_CHANNEL)
     csv: $(IBM_ODF_SUBSCRIPTION_CSVNAME)
@@ -74,7 +74,7 @@ data:
     csv: $(OCS_CLIENT_SUBSCRIPTION_CSVNAME)
     pkg: $(OCS_CLIENT_SUBSCRIPTION_PACKAGE)
     scaleUpOnInstanceOf:
-      - cephclusters.ceph.rook.io
+      - storageclients.ocs.openshift.io
   OCS: |
     channel: $(OCS_SUBSCRIPTION_CHANNEL)
     csv: $(OCS_SUBSCRIPTION_CSVNAME)