Merge pull request #446 from iamniting/ibm-4.13

Bug 2294411:[release-4.13] bundle: update ibm odf version

bundle/manifests/odf-operator-manager-config_v1_configmap.yaml

@@ -8,10 +8,10 @@ data:
   CSIADDONS_SUBSCRIPTION_STARTINGCSV: csi-addons.v0.6.0
   IBM_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
   IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
-  IBM_SUBSCRIPTION_CHANNEL: stable-v1.4
+  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.4.1
+  IBM_SUBSCRIPTION_STARTINGCSV: ibm-storage-odf-operator.v1.5.0
   NOOBAA_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
   NOOBAA_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
   NOOBAA_SUBSCRIPTION_CHANNEL: alpha

catalog/index.yaml

@@ -43,12 +43,12 @@ entries:
   - name: csi-addons.v0.6.0
 
 ---
-defaultChannel: stable-v1.4
+defaultChannel: stable-v1.5
 name: ibm-storage-odf-operator
 schema: olm.package
 ---
 schema: olm.channel
 package: ibm-storage-odf-operator
-name: stable-v1.4
+name: stable-v1.5
 entries:
-  - name: ibm-storage-odf-operator.v1.4.1
+  - name: ibm-storage-odf-operator.v1.5.0

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.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.0
 IBM_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
 IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace

go.mod

@@ -3,11 +3,11 @@ module github.com/red-hat-storage/odf-operator
 go 1.19
 
 require (
-	github.com/IBM/ibm-storage-odf-operator v1.4.1
+	github.com/IBM/ibm-storage-odf-operator v1.5.0
 	github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344
 	github.com/go-logr/logr v1.2.3
-	github.com/onsi/ginkgo/v2 v2.8.3
-	github.com/onsi/gomega v1.27.1
+	github.com/onsi/ginkgo/v2 v2.9.1
+	github.com/onsi/gomega v1.27.4
 	github.com/openshift/api v0.0.0-20230217170555-ab002e9c06da
 	github.com/openshift/custom-resource-status v1.1.2
 	github.com/operator-framework/api v0.17.3
@@ -17,13 +17,12 @@ require (
 	go.uber.org/multierr v1.9.0
 	k8s.io/api v0.26.4
 	k8s.io/apiextensions-apiserver v0.26.1
-	k8s.io/apimachinery v0.26.4
+	k8s.io/apimachinery v0.27.1
 	k8s.io/client-go v0.26.4
 	sigs.k8s.io/controller-runtime v0.14.4
 )
 
 require (
-	cloud.google.com/go/compute v1.18.0 // indirect
 	cloud.google.com/go/iam v0.11.0 // indirect
 	github.com/Azure/go-autorest/autorest/adal v0.9.21 // indirect
 	github.com/armon/go-metrics v0.4.1 // indirect
@@ -46,13 +45,14 @@ require (
 	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/gnostic v0.6.9 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/googleapis/gax-go/v2 v2.11.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-hclog v1.4.0 // indirect
@@ -96,24 +96,25 @@ require (
 	github.com/spf13/pflag v1.0.5 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/crypto v0.6.0 // indirect
-	golang.org/x/net v0.7.0 // indirect
-	golang.org/x/oauth2 v0.5.0 // indirect
-	golang.org/x/sys v0.5.0 // indirect
-	golang.org/x/term v0.5.0 // indirect
-	golang.org/x/text v0.7.0 // indirect
+	golang.org/x/crypto v0.24.0 // indirect
+	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/oauth2 v0.18.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/term v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.6.0 // indirect
+	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	google.golang.org/api v0.126.0 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/component-base v0.26.1 // indirect
-	k8s.io/klog/v2 v2.90.0 // indirect
-	k8s.io/kube-openapi v0.0.0-20230217203603-ff9a8e8fa21d // indirect
+	k8s.io/klog/v2 v2.90.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
 	k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect