bundle: update ibm odf version from 1.5.0 to 1.6.0

Signed-off-by: Nitin Goyal <nigoyal@redhat.com>
red-hat-storage · Sep 30, 2024 · a0bf990 · a0bf990
1 parent fb04e3a
commit a0bf990
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 18 deletions.
diff --git a/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml b/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml
@@ -8,10 +8,10 @@ data:
   CSIADDONS_SUBSCRIPTION_STARTINGCSV: csi-addons.v0.7.0
   IBM_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
   IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
-  IBM_SUBSCRIPTION_CHANNEL: stable-v1.5
+  IBM_SUBSCRIPTION_CHANNEL: stable-v1.6
   IBM_SUBSCRIPTION_NAME: ibm-storage-odf-operator
   IBM_SUBSCRIPTION_PACKAGE: ibm-storage-odf-operator
-  IBM_SUBSCRIPTION_STARTINGCSV: ibm-storage-odf-operator.v1.5.0
+  IBM_SUBSCRIPTION_STARTINGCSV: ibm-storage-odf-operator.v1.6.0
   NOOBAA_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
   NOOBAA_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
   NOOBAA_SUBSCRIPTION_CHANNEL: alpha

diff --git a/catalog/ibm.yaml b/catalog/ibm.yaml
diff --git a/catalog/index.yaml b/catalog/index.yaml
@@ -43,12 +43,48 @@ entries:
   - name: csi-addons.v0.7.0
 
 ---
-defaultChannel: stable-v1.5
+defaultChannel: stable-v1.6
 name: ibm-storage-odf-operator
 schema: olm.package
 ---
 schema: olm.channel
 package: ibm-storage-odf-operator
-name: stable-v1.5
+name: stable-v1.6
 entries:
+<<<<<<< HEAD
   - name: ibm-storage-odf-operator.v1.5.0
+=======
+  - name: ibm-storage-odf-operator.v1.6.0
+
+---
+defaultChannel: alpha
+name: rook-ceph-operator
+schema: olm.package
+---
+schema: olm.channel
+package: rook-ceph-operator
+name: alpha
+entries:
+  - name: rook-ceph-operator.v4.17.0
+
+---
+defaultChannel: beta
+name: odf-prometheus-operator
+schema: olm.package
+---
+schema: olm.channel
+package: odf-prometheus-operator
+name: beta
+entries:
+  - name: odf-prometheus-operator.v4.17.0
+
+---
+defaultChannel: alpha
+name: recipe
+schema: olm.package
+---
+schema: olm.channel
+package: recipe
+name: alpha
+entries:
+  - name: recipe.v0.0.1
diff --git a/config/manager/manager.env b/config/manager/manager.env
@@ -18,7 +18,7 @@ OCS_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
 OCS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
 IBM_SUBSCRIPTION_NAME=ibm-storage-odf-operator
 IBM_SUBSCRIPTION_PACKAGE=ibm-storage-odf-operator
-IBM_SUBSCRIPTION_CHANNEL=stable-v1.5
-IBM_SUBSCRIPTION_STARTINGCSV=ibm-storage-odf-operator.v1.5.0
+IBM_SUBSCRIPTION_CHANNEL=stable-v1.6
+IBM_SUBSCRIPTION_STARTINGCSV=ibm-storage-odf-operator.v1.6.0
 IBM_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
 IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
diff --git a/controllers/defaults.go b/controllers/defaults.go
@@ -47,8 +47,8 @@ var (
 
 		"IBM_SUBSCRIPTION_NAME":                    "ibm-storage-odf-operator",
 		"IBM_SUBSCRIPTION_PACKAGE":                 "ibm-storage-odf-operator",
-		"IBM_SUBSCRIPTION_CHANNEL":                 "stable-v1.4",
-		"IBM_SUBSCRIPTION_STARTINGCSV":             "ibm-storage-odf-operator.v1.4.1",
+		"IBM_SUBSCRIPTION_CHANNEL":                 "stable-v1.6",
+		"IBM_SUBSCRIPTION_STARTINGCSV":             "ibm-storage-odf-operator.v1.6.0",
 		"IBM_SUBSCRIPTION_CATALOGSOURCE":           "odf-catalogsource",
 		"IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE": "openshift-marketplace",
 	}

diff --git a/hack/make-bundle-vars.mk b/hack/make-bundle-vars.mk
@@ -91,7 +91,12 @@ CSIADDONS_BUNDLE_IMG ?= $(CSIADDONS_BUNDLE_IMG_LOCATION)/$(CSIADDONS_BUNDLE_IMG_
 
 IBM_BUNDLE_NAME ?= ibm-storage-odf-operator
 IBM_BUNDLE_IMG_NAME ?= $(IBM_BUNDLE_NAME)-bundle
+<<<<<<< HEAD
 IBM_BUNDLE_IMG_TAG ?= 1.5.0
+=======
+IBM_BUNDLE_VERSION ?= 1.6.0
+IBM_BUNDLE_IMG_TAG ?= 1.6.0
+>>>>>>> cbaa3347 (bundle: update ibm odf version)
 IBM_BUNDLE_IMG_LOCATION ?= quay.io/ibmodffs
 IBM_BUNDLE_IMG ?= $(IBM_BUNDLE_IMG_LOCATION)/$(IBM_BUNDLE_IMG_NAME):$(IBM_BUNDLE_IMG_TAG)
 
@@ -137,7 +142,7 @@ OCS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE ?= $(OPERATOR_CATALOGSOURCE_NAMESPACE)
 
 IBM_SUBSCRIPTION_NAME ?= $(IBM_BUNDLE_NAME)
 IBM_SUBSCRIPTION_PACKAGE ?= $(IBM_BUNDLE_NAME)
-IBM_SUBSCRIPTION_CHANNEL ?= stable-v1.5
+IBM_SUBSCRIPTION_CHANNEL ?= stable-v1.6
 IBM_SUBSCRIPTION_STARTINGCSV ?= $(IBM_BUNDLE_NAME).v$(IBM_BUNDLE_IMG_TAG)
 IBM_SUBSCRIPTION_CATALOGSOURCE ?= $(OPERATOR_CATALOGSOURCE)
 IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE ?= $(OPERATOR_CATALOGSOURCE_NAMESPACE)