From 0e293c8f10f765ace489426ae3f847a2e3b917fa Mon Sep 17 00:00:00 2001 From: Nitin Goyal Date: Wed, 6 Dec 2023 20:09:14 +0530 Subject: [PATCH 1/2] bundle: update the IBM fs version Signed-off-by: Nitin Goyal (cherry picked from commit 165c3fadf2372e354bc46f0ac3c6d1cf6a7eeb9e) --- .../manifests/odf-operator-manager-config_v1_configmap.yaml | 2 +- catalog/index.yaml | 2 +- config/manager/manager.env | 2 +- controllers/defaults.go | 2 +- hack/make-bundle-vars.mk | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml b/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml index 98452c506..77c2218de 100644 --- a/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml +++ b/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml @@ -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 diff --git a/catalog/index.yaml b/catalog/index.yaml index 1462ac8fc..7ae01228f 100644 --- a/catalog/index.yaml +++ b/catalog/index.yaml @@ -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 diff --git a/config/manager/manager.env b/config/manager/manager.env index e352a71d9..ebb48b5a0 100644 --- a/config/manager/manager.env +++ b/config/manager/manager.env @@ -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 diff --git a/controllers/defaults.go b/controllers/defaults.go index 1161194d6..7e06372e0 100644 --- a/controllers/defaults.go +++ b/controllers/defaults.go @@ -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", } diff --git a/hack/make-bundle-vars.mk b/hack/make-bundle-vars.mk index 1de7e2e04..1d2fbe31e 100644 --- a/hack/make-bundle-vars.mk +++ b/hack/make-bundle-vars.mk @@ -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 From 5f4d6bfbef4c796a5806b153146f5a7d5914daa8 Mon Sep 17 00:00:00 2001 From: Mudit Agarwal Date: Thu, 7 Dec 2023 21:55:33 +0530 Subject: [PATCH 2/2] godeps: update ibm odf FS apis Signed-off-by: Mudit Agarwal --- go.mod | 2 +- go.sum | 4 ++-- vendor/modules.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index a905c6669..c215a53a5 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index 6855e18bf..e6c08dcde 100644 --- a/go.sum +++ b/go.sum @@ -149,8 +149,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.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/Jeffail/gabs v1.1.1 h1:V0uzR08Hj22EX8+8QMhyI9sX2hwRu+/RJhJUmnwda/E= github.com/Jeffail/gabs v1.1.1/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc= diff --git a/vendor/modules.txt b/vendor/modules.txt index 0618213ef..9521c3ee7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -6,7 +6,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.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/armon/go-metrics v0.4.1