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 2315707:[release-4.15] update ibm odf operator to 1.6.0 and apis to 1.5.1 #491

Merged
merged 2 commits into from
Oct 7, 2024
+24 −24
Merged

Bug 2315707:[release-4.15] update ibm odf operator to 1.6.0 and apis to 1.5.1 #491

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
f888808
bundle: update ibm odf version from 1.5.0 to 1.6.0
iamniting Sep 19, 2024
95fb95e
godeps: update ibm apis version from 1.5.0 to 1.5.1
iamniting Sep 25, 2024
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
4 changes: 2 additions & 2 deletions 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 @@ -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.5
IBM_SUBSCRIPTION_CHANNEL: stable-v1.6
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.6.0
NOOBAA_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
NOOBAA_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
NOOBAA_SUBSCRIPTION_CHANNEL: alpha
Expand Down
18 changes: 9 additions & 9 deletions catalog/ibm.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions catalog/index.yaml
View file
Open in desktop
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.5
defaultChannel: stable-v1.6
name: ibm-storage-odf-operator
schema: olm.package
---
schema: olm.channel
package: ibm-storage-odf-operator
name: stable-v1.5
name: stable-v1.6
entries:
- name: ibm-storage-odf-operator.v1.5.0
- name: ibm-storage-odf-operator.v1.6.0
4 changes: 2 additions & 2 deletions config/manager/manager.env
View file
Open in desktop
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.5
IBM_SUBSCRIPTION_STARTINGCSV=ibm-storage-odf-operator.v1.5.0
IBM_SUBSCRIPTION_CHANNEL=stable-v1.6
IBM_SUBSCRIPTION_STARTINGCSV=ibm-storage-odf-operator.v1.6.0
IBM_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
4 changes: 2 additions & 2 deletions controllers/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.6",
"IBM_SUBSCRIPTION_STARTINGCSV": "ibm-storage-odf-operator.v1.6.0",
"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.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.3.0
github.com/onsi/ginkgo/v2 v2.11.0
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 @@ -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.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/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
View file
Open in desktop
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.5.0
IBM_BUNDLE_IMG_TAG ?= 1.6.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.5
IBM_SUBSCRIPTION_CHANNEL ?= stable-v1.6
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
2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 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/beorn7/perks v1.0.1
Expand Down
Loading