Merge pull request #478 from red-hat-storage/sync_ds--main

Syncing latest changes from main for odf-operator
red-hat-storage · Sep 25, 2024 · 629c4f6 · 629c4f6
2 parents 3e62ce8 + 5c977b2
commit 629c4f6
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 26 deletions.
diff --git a/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml b/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml
@@ -11,7 +11,7 @@ data:
   CSIADDONS_SUBSCRIPTION_CHANNEL: alpha
   CSIADDONS_SUBSCRIPTION_NAME: csi-addons
   CSIADDONS_SUBSCRIPTION_PACKAGE: csi-addons
-  CSIADDONS_SUBSCRIPTION_STARTINGCSV: csi-addons.v0.9.1
+  CSIADDONS_SUBSCRIPTION_STARTINGCSV: csi-addons.v0.10.0
   IBM_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
   IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
   IBM_SUBSCRIPTION_CHANNEL: stable-v1.5

diff --git a/bundle/metadata/dependencies.yaml b/bundle/metadata/dependencies.yaml
@@ -18,7 +18,7 @@ dependencies:
 - type: olm.package
   value:
     packageName: csi-addons
-    version: ">=0.8.0 <=0.9.1"
+    version: ">=0.9.1 <=0.10.0"
 - type: olm.package
   value:
     packageName: cephcsi-operator

diff --git a/catalog/csiaddons.yaml b/catalog/csiaddons.yaml
diff --git a/catalog/index.yaml b/catalog/index.yaml
@@ -51,7 +51,7 @@ schema: olm.channel
 package: csi-addons
 name: alpha
 entries:
-  - name: csi-addons.v0.9.1
+  - name: csi-addons.v0.10.0
 
 ---
 defaultChannel: alpha

diff --git a/catalog/recipe.yaml b/catalog/recipe.yaml
diff --git a/config/manager/manager.env b/config/manager/manager.env
@@ -7,7 +7,7 @@ NOOBAA_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
 CSIADDONS_SUBSCRIPTION_NAME=csi-addons
 CSIADDONS_SUBSCRIPTION_PACKAGE=csi-addons
 CSIADDONS_SUBSCRIPTION_CHANNEL=alpha
-CSIADDONS_SUBSCRIPTION_STARTINGCSV=csi-addons.v0.9.1
+CSIADDONS_SUBSCRIPTION_STARTINGCSV=csi-addons.v0.10.0
 CSIADDONS_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
 CSIADDONS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
 CEPHCSI_SUBSCRIPTION_NAME=cephcsi-operator

diff --git a/controllers/defaults.go b/controllers/defaults.go
@@ -48,7 +48,7 @@ var (
 		"CSIADDONS_SUBSCRIPTION_NAME":                    "csi-addons",
 		"CSIADDONS_SUBSCRIPTION_PACKAGE":                 "csi-addons",
 		"CSIADDONS_SUBSCRIPTION_CHANNEL":                 "alpha",
-		"CSIADDONS_SUBSCRIPTION_STARTINGCSV":             "csi-addons.v0.9.1",
+		"CSIADDONS_SUBSCRIPTION_STARTINGCSV":             "csi-addons.v0.10.0",
 		"CSIADDONS_SUBSCRIPTION_CATALOGSOURCE":           "odf-catalogsource",
 		"CSIADDONS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE": "openshift-marketplace",
 

diff --git a/hack/make-bundle-vars.mk b/hack/make-bundle-vars.mk
@@ -94,8 +94,8 @@ NOOBAA_BUNDLE_IMG ?= $(NOOBAA_BUNDLE_IMG_LOCATION)/$(NOOBAA_BUNDLE_IMG_NAME):$(N
 
 CSIADDONS_BUNDLE_NAME ?= csi-addons
 CSIADDONS_BUNDLE_IMG_NAME ?= k8s-bundle
-CSIADDONS_BUNDLE_VERSION ?= v0.9.1
-CSIADDONS_BUNDLE_IMG_TAG ?= v0.9.1
+CSIADDONS_BUNDLE_VERSION ?= v0.10.0
+CSIADDONS_BUNDLE_IMG_TAG ?= v0.10.0
 CSIADDONS_BUNDLE_IMG_LOCATION ?= quay.io/csiaddons
 CSIADDONS_BUNDLE_IMG ?= $(CSIADDONS_BUNDLE_IMG_LOCATION)/$(CSIADDONS_BUNDLE_IMG_NAME):$(CSIADDONS_BUNDLE_IMG_TAG)