Merge pull request #646 from iamniting/ibm-revert

openshift-merge-bot[bot] · web-flow · commit 12df9d78e618 · 2025-08-01T11:02:39.000Z
Remove the ibm-storage-odf-operator as a dependency
diff --git a/bundle/odf-dependencies/metadata/dependencies.yaml b/bundle/odf-dependencies/metadata/dependencies.yaml
@@ -35,7 +35,3 @@ dependencies:
   value:
     packageName: recipe
     version: "0.0.1"
-- type: olm.package
-  value:
-    packageName: ibm-storage-odf-operator
-    version: "1.8.0"
diff --git a/catalog/odf-dependencies.yaml b/catalog/odf-dependencies.yaml
@@ -17,10 +17,6 @@ properties:
   value:
     packageName: csi-addons
     versionRange: 0.12.0
-- type: olm.package.required
-  value:
-    packageName: ibm-storage-odf-operator
-    versionRange: 1.8.0
 - type: olm.package.required
   value:
     packageName: noobaa-operator
diff --git a/hack/install-odf.sh b/hack/install-odf.sh
@@ -75,6 +75,4 @@ oc wait --timeout=5m --for condition=Available -n "$INSTALL_NAMESPACE" deploymen
     prometheus-operator \
     rook-ceph-operator \
     ux-backend-server \
-    odf-external-snapshotter-operator \
-    ibm-storage-odf-operator \
-    ibm-block-csi-operator
+    odf-external-snapshotter-operator
diff --git a/hack/make-bundle-vars.mk b/hack/make-bundle-vars.mk
@@ -187,6 +187,4 @@ CSV_NAMES ?= odf-operator.v$(VERSION) \
 	$(CSIADDONS_SUBSCRIPTION_CSVNAME) \
 	$(ODF_SNAPSHOT_CONTROLLER_SUBSCRIPTION_CSVNAME) \
 	$(PROMETHEUS_SUBSCRIPTION_CSVNAME) \
-	$(RECIPE_SUBSCRIPTION_CSVNAME) \
-	$(IBM_ODF_SUBSCRIPTION_CSVNAME) \
-	$(IBM_CSI_SUBSCRIPTION_CSVNAME)
+	$(RECIPE_SUBSCRIPTION_CSVNAME)
diff --git a/hack/make-files.mk b/hack/make-files.mk
@@ -140,10 +140,6 @@ dependencies:
   value:
     packageName: $(RECIPE_SUBSCRIPTION_PACKAGE)
     version: "$(subst v,,$(RECIPE_BUNDLE_VERSION))"
-- type: olm.package
-  value:
-    packageName: $(IBM_ODF_SUBSCRIPTION_PACKAGE)
-    version: "$(subst v,,$(IBM_ODF_BUNDLE_VERSION))"
 endef
 export ODF_DEPENDENCIES_YAML
 
