Skip to content

Commit

Permalink
Merge pull request #350 from iamniting/ibm
Browse files Browse the repository at this point in the history
bundle: update the IBM fs version
  • Loading branch information
openshift-merge-bot[bot] authored Dec 7, 2023
2 parents 509016e + bdba008 commit 9f22ea4
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
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
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
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
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
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.3.1-0.20230608092004-7525dea20038
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.4
github.com/onsi/ginkgo/v2 v2.11.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.1-0.20230608092004-7525dea20038 h1:81XzjhDREmXcu3ibvozXvRPUN5qDivnljR1pLtPMN+c=
github.com/IBM/ibm-storage-odf-operator v1.3.1-0.20230608092004-7525dea20038/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/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
Expand Down
4 changes: 2 additions & 2 deletions hack/make-bundle-vars.mk
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# github.com/IBM/ibm-storage-odf-operator v1.3.1-0.20230608092004-7525dea20038
# 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/beorn7/perks v1.0.1
Expand Down

0 comments on commit 9f22ea4

Please sign in to comment.