Merge pull request #482 from iamniting/ibm-4.14

Bug 2314668:[release-4.14] update ibm odf operator to 1.5.1
red-hat-storage · Oct 7, 2024 · 8b8b468 · 8b8b468
2 parents 493c463 + 2380885
commit 8b8b468
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 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:
   IBM_SUBSCRIPTION_CHANNEL: stable-v1.5
   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.5.1
   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
@@ -51,4 +51,4 @@ schema: olm.channel
 package: ibm-storage-odf-operator
 name: stable-v1.5
 entries:
-  - name: ibm-storage-odf-operator.v1.5.0
+  - name: ibm-storage-odf-operator.v1.5.1
diff --git a/config/manager/manager.env b/config/manager/manager.env
@@ -19,6 +19,6 @@ 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_STARTINGCSV=ibm-storage-odf-operator.v1.5.1
 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.5",
+		"IBM_SUBSCRIPTION_STARTINGCSV":             "ibm-storage-odf-operator.v1.5.1",
 		"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.2.4
 	github.com/onsi/ginkgo/v2 v2.11.0

diff --git a/go.sum b/go.sum
@@ -148,8 +148,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
 github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/DataDog/datadog-go v3.2.0+incompatible h1:qSG2N4FghB1He/r2mFrWKCaL7dXCilEuNEeAn20fdD4=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-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/Jeffail/gabs v1.1.1 h1:V0uzR08Hj22EX8+8QMhyI9sX2hwRu+/RJhJUmnwda/E=
 github.com/Jeffail/gabs v1.1.1/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc=

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.5.1
 IBM_BUNDLE_IMG_LOCATION ?= quay.io/ibmodffs
 IBM_BUNDLE_IMG ?= $(IBM_BUNDLE_IMG_LOCATION)/$(IBM_BUNDLE_IMG_NAME):$(IBM_BUNDLE_IMG_TAG)
 

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -4,7 +4,7 @@
 ## explicit; go 1.19
 # github.com/Azure/go-autorest/autorest/adal v0.9.21
 ## explicit; go 1.15
-# 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/armon/go-metrics v0.4.1