Skip to content

Commit

Permalink
Merge pull request #445 from iamniting/ibm-4.14
Browse files Browse the repository at this point in the history 
Bug 2294410:[release-4.14] bundle: update ibm odf version
  • Loading branch information
@openshift-merge-bot
openshift-merge-bot[bot] authored Jul 25, 2024
2 parents 587b936 + dfc889d commit 62a8295
Show file tree
Hide file tree
Showing 504 changed files with 16,538 additions and 8,244 deletions.
4 changes: 2 additions & 2 deletions bundle/manifests/odf-operator-manager-config_v1_configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.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
Expand Down
20 changes: 10 additions & 10 deletions catalog/ibm.yaml
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions catalog/index.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ entries:
- name: csi-addons.v0.7.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
4 changes: 2 additions & 2 deletions config/manager/manager.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
32 changes: 18 additions & 14 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/red-hat-storage/odf-operator
go 1.20

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.4
github.com/onsi/ginkgo/v2 v2.11.0
Expand All @@ -23,7 +23,11 @@ require (
)

require (
cloud.google.com/go/compute v1.19.1 // indirect
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
google.golang.org/api v0.126.0 // indirect
)

require (
cloud.google.com/go/kms v1.10.1 // indirect
cloud.google.com/go/monitoring v1.13.0 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.21 // indirect
Expand All @@ -48,13 +52,13 @@ require (
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // 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.3 // 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-20230510103437-eeec1cb781c3 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/google/uuid v1.6.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.5.0 // indirect
Expand Down Expand Up @@ -99,17 +103,17 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.9.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.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.9.3 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.31.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/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
68 changes: 37 additions & 31 deletions go.sum
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions hack/make-bundle-vars.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.1
IBM_BUNDLE_IMG_TAG ?= 1.5.0
IBM_BUNDLE_IMG_LOCATION ?= quay.io/ibmodffs
IBM_BUNDLE_IMG ?= $(IBM_BUNDLE_IMG_LOCATION)/$(IBM_BUNDLE_IMG_NAME):$(IBM_BUNDLE_IMG_TAG)

Expand Down Expand Up @@ -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.4
IBM_SUBSCRIPTION_CHANNEL ?= stable-v1.5
IBM_SUBSCRIPTION_STARTINGCSV ?= $(IBM_BUNDLE_NAME).v$(IBM_BUNDLE_IMG_TAG)
IBM_SUBSCRIPTION_CATALOGSOURCE ?= $(OPERATOR_CATALOGSOURCE)
IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE ?= $(OPERATOR_CATALOGSOURCE_NAMESPACE)
Expand Down
4 changes: 2 additions & 2 deletions vendor/github.com/IBM/ibm-storage-odf-operator/api/v1alpha1/groupversion_info.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions vendor/github.com/golang/protobuf/ptypes/any.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 20 additions & 18 deletions vendor/github.com/google/go-cmp/cmp/compare.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions ...ub.com/google/go-cmp/cmp/export_unsafe.go → ...or/github.com/google/go-cmp/cmp/export.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions vendor/github.com/google/go-cmp/cmp/export_panic.go
View file

This file was deleted.

3 changes: 0 additions & 3 deletions ...-cmp/cmp/internal/value/pointer_unsafe.go → ...ogle/go-cmp/cmp/internal/value/pointer.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 0 additions & 34 deletions vendor/github.com/google/go-cmp/cmp/internal/value/pointer_purego.go
View file

This file was deleted.

Loading

0 comments on commit 62a8295

Please sign in to comment.