Merge pull request #491 from iamniting/ibm-4.15

Bug 2315707:[release-4.15] update ibm odf operator to 1.6.0 and apis to 1.5.1
red-hat-storage · Oct 7, 2024 · 4a4a400 · 4a4a400
2 parents 7f6f888 + 95fb95e
commit 4a4a400
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 24 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,12 @@ 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:
-  - name: ibm-storage-odf-operator.v1.5.0
+  - name: ibm-storage-odf-operator.v1.6.0
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/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/red-hat-storage/odf-operator
 go 1.20
 
 require (
-	github.com/IBM/ibm-storage-odf-operator v1.5.0
+	github.com/IBM/ibm-storage-odf-operator v1.5.1
 	github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344
 	github.com/go-logr/logr v1.3.0
 	github.com/onsi/ginkgo/v2 v2.11.0

diff --git a/go.sum b/go.sum
@@ -85,8 +85,8 @@ github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbt
 github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/IBM/ibm-storage-odf-operator v1.5.0 h1:09bRqiHJpxUoHWfbY0V29bSeQNwDf/eLiZ9rU7sI9Pc=
-github.com/IBM/ibm-storage-odf-operator v1.5.0/go.mod h1:lpZYtAcWTv9sPXEm4/E3vgYnDawbj2tDajkDwueO4QM=
+github.com/IBM/ibm-storage-odf-operator v1.5.1 h1:KqlzphSyfa5kjYsuZ10b6UrO7Sr6HovqeYe8jRtB9HM=
+github.com/IBM/ibm-storage-odf-operator v1.5.1/go.mod h1:lpZYtAcWTv9sPXEm4/E3vgYnDawbj2tDajkDwueO4QM=
 github.com/IBM/keyprotect-go-client v0.5.1/go.mod h1:5TwDM/4FRJq1ZOlwQL1xFahLWQ3TveR88VmL1u3njyI=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=

diff --git a/hack/make-bundle-vars.mk b/hack/make-bundle-vars.mk
@@ -91,7 +91,7 @@ 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
-IBM_BUNDLE_IMG_TAG ?= 1.5.0
+IBM_BUNDLE_IMG_TAG ?= 1.6.0
 IBM_BUNDLE_IMG_LOCATION ?= quay.io/ibmodffs
 IBM_BUNDLE_IMG ?= $(IBM_BUNDLE_IMG_LOCATION)/$(IBM_BUNDLE_IMG_NAME):$(IBM_BUNDLE_IMG_TAG)
 
@@ -137,7 +137,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)

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1,4 +1,4 @@
-# github.com/IBM/ibm-storage-odf-operator v1.5.0
+# github.com/IBM/ibm-storage-odf-operator v1.5.1
 ## explicit; go 1.20
 github.com/IBM/ibm-storage-odf-operator/api/v1alpha1
 # github.com/beorn7/perks v1.0.1