From 11711d8796472e750a495b19ec5ee42f219e42a2 Mon Sep 17 00:00:00 2001 From: Nitin Goyal Date: Thu, 14 Sep 2023 11:43:40 +0530 Subject: [PATCH] Revert "makefile: update ibm-storage-odf version" This reverts commit 62c123a70a6a120a2157541c5e560dd7cd623fea. Signed-off-by: Nitin Goyal --- .../manifests/odf-operator-manager-config_v1_configmap.yaml | 4 ++-- catalog/index.yaml | 6 +++--- config/manager/manager.env | 4 ++-- controllers/defaults.go | 4 ++-- hack/make-bundle-vars.mk | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml b/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml index f80a25cc1..98452c506 100644 --- a/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml +++ b/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml @@ -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.4 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.4.0 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 69d5ab914..1462ac8fc 100644 --- a/catalog/index.yaml +++ b/catalog/index.yaml @@ -43,12 +43,12 @@ entries: - name: csi-addons.v0.7.0 --- -defaultChannel: stable-v1.5 +defaultChannel: stable-v1.4 name: ibm-storage-odf-operator schema: olm.package --- schema: olm.channel package: ibm-storage-odf-operator -name: stable-v1.5 +name: stable-v1.4 entries: - - name: ibm-storage-odf-operator.v1.5.0 + - name: ibm-storage-odf-operator.v1.4.0 diff --git a/config/manager/manager.env b/config/manager/manager.env index af559e9d4..e352a71d9 100644 --- a/config/manager/manager.env +++ b/config/manager/manager.env @@ -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.4 +IBM_SUBSCRIPTION_STARTINGCSV=ibm-storage-odf-operator.v1.4.0 IBM_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace diff --git a/controllers/defaults.go b/controllers/defaults.go index 24180ca07..1161194d6 100644 --- a/controllers/defaults.go +++ b/controllers/defaults.go @@ -47,8 +47,8 @@ var ( "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.4", + "IBM_SUBSCRIPTION_STARTINGCSV": "ibm-storage-odf-operator.v1.4.0", "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 1bdc22501..1de7e2e04 100644 --- a/hack/make-bundle-vars.mk +++ b/hack/make-bundle-vars.mk @@ -87,7 +87,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.4.0 IBM_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev IBM_BUNDLE_IMG ?= $(IBM_BUNDLE_IMG_LOCATION)/$(IBM_BUNDLE_IMG_NAME):$(IBM_BUNDLE_IMG_TAG) @@ -133,7 +133,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.4 IBM_SUBSCRIPTION_STARTINGCSV ?= $(IBM_BUNDLE_NAME).v$(IBM_BUNDLE_IMG_TAG) IBM_SUBSCRIPTION_CATALOGSOURCE ?= $(OPERATOR_CATALOGSOURCE) IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE ?= $(OPERATOR_CATALOGSOURCE_NAMESPACE)