Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 2253402: bundle: update the IBM fs version #353

Merged
merged 2 commits into from
Dec 7, 2023
Merged

Bug 2253402: bundle: update the IBM fs version #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ee679a
bundle: update the IBM fs version
iamniting Dec 6, 2023
65229aa
godeps: update ibm odf FS apis
iamniting Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bundle/manifests/odf-operator-manager-config_v1_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ data:
IBM_SUBSCRIPTION_CHANNEL: stable-v1.4
IBM_SUBSCRIPTION_NAME: ibm-storage-odf-operator
IBM_SUBSCRIPTION_PACKAGE: ibm-storage-odf-operator
IBM_SUBSCRIPTION_STARTINGCSV: ibm-storage-odf-operator.v1.4.0
IBM_SUBSCRIPTION_STARTINGCSV: ibm-storage-odf-operator.v1.4.1
NOOBAA_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
NOOBAA_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
NOOBAA_SUBSCRIPTION_CHANNEL: alpha
Expand Down
2 changes: 1 addition & 1 deletion catalog/index.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ schema: olm.channel
package: ibm-storage-odf-operator
name: stable-v1.4
entries:
- name: ibm-storage-odf-operator.v1.4.0
- name: ibm-storage-odf-operator.v1.4.1
2 changes: 1 addition & 1 deletion config/manager/manager.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.4
IBM_SUBSCRIPTION_STARTINGCSV=ibm-storage-odf-operator.v1.4.0
IBM_SUBSCRIPTION_STARTINGCSV=ibm-storage-odf-operator.v1.4.1
IBM_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
2 changes: 1 addition & 1 deletion controllers/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ 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.0",
"IBM_SUBSCRIPTION_STARTINGCSV": "ibm-storage-odf-operator.v1.4.1",
"IBM_SUBSCRIPTION_CATALOGSOURCE": "odf-catalogsource",
"IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE": "openshift-marketplace",
}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
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.19

require (
github.com/IBM/ibm-storage-odf-operator v1.3.1-0.20230201081526-a62cc98b3818
github.com/IBM/ibm-storage-odf-operator v1.4.1
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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.1-0.20230201081526-a62cc98b3818 h1:Wy38MJB0ETlAlUlzhnWADEQvZIZr4giDWRAKK1jbH8Q=
github.com/IBM/ibm-storage-odf-operator v1.3.1-0.20230201081526-a62cc98b3818/go.mod h1:TmOsuYoZIu70IMMZzdxfj1OH5EPPon3u1qzuQO9Xaxo=
github.com/IBM/ibm-storage-odf-operator v1.4.1 h1:OoWfV1FQ3byJz5mU9dNi3BZ1BnwNXF3hQMZObvwXiWs=
github.com/IBM/ibm-storage-odf-operator v1.4.1/go.mod h1:TmOsuYoZIu70IMMZzdxfj1OH5EPPon3u1qzuQO9Xaxo=
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=
Expand Down
4 changes: 2 additions & 2 deletions hack/make-bundle-vars.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ 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.0
IBM_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev
IBM_BUNDLE_IMG_TAG ?= 1.4.1
IBM_BUNDLE_IMG_LOCATION ?= quay.io/ibmodffs
IBM_BUNDLE_IMG ?= $(IBM_BUNDLE_IMG_LOCATION)/$(IBM_BUNDLE_IMG_NAME):$(IBM_BUNDLE_IMG_TAG)

ODF_CONSOLE_IMG_NAME ?= odf-console
Expand Down
2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.1-0.20230201081526-a62cc98b3818
# github.com/IBM/ibm-storage-odf-operator v1.4.1
## explicit; go 1.18
github.com/IBM/ibm-storage-odf-operator/api/v1alpha1
# github.com/armon/go-metrics v0.4.1
Expand Down