From 986e92b8926566796bf5c90679610d2296783a19 Mon Sep 17 00:00:00 2001 From: Nitin Goyal Date: Fri, 29 Mar 2024 15:24:17 +0530 Subject: [PATCH] makefile: Introduce Separate Variable for CSV Version sometimes image tags are not same as the csv version. which makes it impossible to use the same variable for the image tag and csv version. Signed-off-by: Nitin Goyal --- hack/make-bundle-vars.mk | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/hack/make-bundle-vars.mk b/hack/make-bundle-vars.mk index f803378c2..f8e52f87a 100644 --- a/hack/make-bundle-vars.mk +++ b/hack/make-bundle-vars.mk @@ -69,30 +69,35 @@ CRD_OPTIONS ?= "crd" OCS_BUNDLE_NAME ?= ocs-operator OCS_BUNDLE_IMG_NAME ?= $(OCS_BUNDLE_NAME)-bundle +OCS_BUNDLE_VERSION ?= v4.16.0 OCS_BUNDLE_IMG_TAG ?= v4.16.0 OCS_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev OCS_BUNDLE_IMG ?= $(OCS_BUNDLE_IMG_LOCATION)/$(OCS_BUNDLE_IMG_NAME):$(OCS_BUNDLE_IMG_TAG) OCS_CLIENT_BUNDLE_NAME ?= ocs-client-operator OCS_CLIENT_BUNDLE_IMG_NAME ?= $(OCS_CLIENT_BUNDLE_NAME)-bundle +OCS_CLIENT_BUNDLE_VERSION ?= v4.15.0 OCS_CLIENT_BUNDLE_IMG_TAG ?= v4.15.0 OCS_CLIENT_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev OCS_CLIENT_BUNDLE_IMG ?= $(OCS_CLIENT_BUNDLE_IMG_LOCATION)/$(OCS_CLIENT_BUNDLE_IMG_NAME):$(OCS_CLIENT_BUNDLE_IMG_TAG) NOOBAA_BUNDLE_NAME ?= noobaa-operator NOOBAA_BUNDLE_IMG_NAME ?= $(NOOBAA_BUNDLE_NAME)-bundle +NOOBAA_BUNDLE_VERSION ?= v5.14.0 NOOBAA_BUNDLE_IMG_TAG ?= v5.14.0 NOOBAA_BUNDLE_IMG_LOCATION ?= quay.io/noobaa NOOBAA_BUNDLE_IMG ?= $(NOOBAA_BUNDLE_IMG_LOCATION)/$(NOOBAA_BUNDLE_IMG_NAME):$(NOOBAA_BUNDLE_IMG_TAG) CSIADDONS_BUNDLE_NAME ?= csi-addons CSIADDONS_BUNDLE_IMG_NAME ?= k8s-bundle +CSIADDONS_BUNDLE_VERSION ?= v0.7.0 CSIADDONS_BUNDLE_IMG_TAG ?= v0.7.0 CSIADDONS_BUNDLE_IMG_LOCATION ?= quay.io/csiaddons CSIADDONS_BUNDLE_IMG ?= $(CSIADDONS_BUNDLE_IMG_LOCATION)/$(CSIADDONS_BUNDLE_IMG_NAME):$(CSIADDONS_BUNDLE_IMG_TAG) IBM_BUNDLE_NAME ?= ibm-storage-odf-operator IBM_BUNDLE_IMG_NAME ?= $(IBM_BUNDLE_NAME)-bundle +IBM_BUNDLE_VERSION ?= 1.4.1 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) @@ -104,6 +109,7 @@ ODF_CONSOLE_IMG ?= $(ODF_CONSOLE_IMG_LOCATION)/$(ODF_CONSOLE_IMG_NAME):$(ODF_CON ROOK_BUNDLE_NAME ?= rook-ceph-operator ROOK_BUNDLE_IMG_NAME ?= $(ROOK_BUNDLE_NAME)-bundle +ROOK_BUNDLE_VERSION ?= v4.15.0 ROOK_BUNDLE_IMG_TAG ?= v4.15.0 ROOK_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev ROOK_BUNDLE_IMG ?= $(ROOK_BUNDLE_IMG_LOCATION)/$(ROOK_BUNDLE_IMG_NAME):$(ROOK_BUNDLE_IMG_TAG) @@ -111,6 +117,7 @@ ROOK_BUNDLE_IMG ?= $(ROOK_BUNDLE_IMG_LOCATION)/$(ROOK_BUNDLE_IMG_NAME):$(ROOK_BU # To be changed when odf-prometheus-operator bundle exists PROMETHEUS_BUNDLE_NAME ?= odf-prometheus-operator PROMETHEUS_BUNDLE_IMG_NAME ?= $(PROMETHEUS_BUNDLE_NAME)-bundle +PROMETHEUS_BUNDLE_VERSION ?= v4.10.0 PROMETHEUS_BUNDLE_IMG_TAG ?= v4.10.0 PROMETHEUS_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev PROMETHEUS_BUNDLE_IMG ?= $(PROMETHEUS_BUNDLE_IMG_LOCATION)/$(PROMETHEUS_BUNDLE_IMG_NAME):$(PROMETHEUS_BUNDLE_IMG_TAG) @@ -132,49 +139,49 @@ OPERATOR_CATALOGSOURCE_NAMESPACE ?= openshift-marketplace NOOBAA_SUBSCRIPTION_NAME ?= $(NOOBAA_BUNDLE_NAME) NOOBAA_SUBSCRIPTION_PACKAGE ?= $(NOOBAA_BUNDLE_NAME) NOOBAA_SUBSCRIPTION_CHANNEL ?= $(DEFAULT_CHANNEL) -NOOBAA_SUBSCRIPTION_STARTINGCSV ?= $(NOOBAA_BUNDLE_NAME).$(NOOBAA_BUNDLE_IMG_TAG) +NOOBAA_SUBSCRIPTION_STARTINGCSV ?= $(NOOBAA_BUNDLE_NAME).$(NOOBAA_BUNDLE_VERSION) NOOBAA_SUBSCRIPTION_CATALOGSOURCE ?= $(OPERATOR_CATALOGSOURCE) NOOBAA_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE ?= $(OPERATOR_CATALOGSOURCE_NAMESPACE) CSIADDONS_SUBSCRIPTION_NAME ?= $(CSIADDONS_BUNDLE_NAME) CSIADDONS_SUBSCRIPTION_PACKAGE ?= $(CSIADDONS_BUNDLE_NAME) CSIADDONS_SUBSCRIPTION_CHANNEL ?= $(DEFAULT_CHANNEL) -CSIADDONS_SUBSCRIPTION_STARTINGCSV ?= $(CSIADDONS_BUNDLE_NAME).$(CSIADDONS_BUNDLE_IMG_TAG) +CSIADDONS_SUBSCRIPTION_STARTINGCSV ?= $(CSIADDONS_BUNDLE_NAME).$(CSIADDONS_BUNDLE_VERSION) CSIADDONS_SUBSCRIPTION_CATALOGSOURCE ?= $(OPERATOR_CATALOGSOURCE) CSIADDONS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE ?= $(OPERATOR_CATALOGSOURCE_NAMESPACE) OCS_SUBSCRIPTION_NAME ?= $(OCS_BUNDLE_NAME) OCS_SUBSCRIPTION_PACKAGE ?= $(OCS_BUNDLE_NAME) OCS_SUBSCRIPTION_CHANNEL ?= $(DEFAULT_CHANNEL) -OCS_SUBSCRIPTION_STARTINGCSV ?= $(OCS_BUNDLE_NAME).$(OCS_BUNDLE_IMG_TAG) +OCS_SUBSCRIPTION_STARTINGCSV ?= $(OCS_BUNDLE_NAME).$(OCS_BUNDLE_VERSION) OCS_SUBSCRIPTION_CATALOGSOURCE ?= $(OPERATOR_CATALOGSOURCE) OCS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE ?= $(OPERATOR_CATALOGSOURCE_NAMESPACE) OCS_CLIENT_SUBSCRIPTION_NAME ?= $(OCS_CLIENT_BUNDLE_NAME) OCS_CLIENT_SUBSCRIPTION_PACKAGE ?= $(OCS_CLIENT_BUNDLE_NAME) OCS_CLIENT_SUBSCRIPTION_CHANNEL ?= $(DEFAULT_CHANNEL) -OCS_CLIENT_SUBSCRIPTION_STARTINGCSV ?= $(OCS_CLIENT_BUNDLE_NAME).$(OCS_CLIENT_BUNDLE_IMG_TAG) +OCS_CLIENT_SUBSCRIPTION_STARTINGCSV ?= $(OCS_CLIENT_BUNDLE_NAME).$(OCS_CLIENT_BUNDLE_VERSION) OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE ?= $(OPERATOR_CATALOGSOURCE) OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE ?= $(OPERATOR_CATALOGSOURCE_NAMESPACE) IBM_SUBSCRIPTION_NAME ?= $(IBM_BUNDLE_NAME) IBM_SUBSCRIPTION_PACKAGE ?= $(IBM_BUNDLE_NAME) IBM_SUBSCRIPTION_CHANNEL ?= stable-v1.4 -IBM_SUBSCRIPTION_STARTINGCSV ?= $(IBM_BUNDLE_NAME).v$(IBM_BUNDLE_IMG_TAG) +IBM_SUBSCRIPTION_STARTINGCSV ?= $(IBM_BUNDLE_NAME).v$(IBM_BUNDLE_VERSION) IBM_SUBSCRIPTION_CATALOGSOURCE ?= $(OPERATOR_CATALOGSOURCE) IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE ?= $(OPERATOR_CATALOGSOURCE_NAMESPACE) ROOK_SUBSCRIPTION_NAME ?= $(ROOK_BUNDLE_NAME) ROOK_SUBSCRIPTION_PACKAGE ?= $(ROOK_BUNDLE_NAME) ROOK_SUBSCRIPTION_CHANNEL ?= $(DEFAULT_CHANNEL) -ROOK_SUBSCRIPTION_STARTINGCSV ?= $(ROOK_BUNDLE_NAME).$(ROOK_BUNDLE_IMG_TAG) +ROOK_SUBSCRIPTION_STARTINGCSV ?= $(ROOK_BUNDLE_NAME).$(ROOK_BUNDLE_VERSION) ROOK_SUBSCRIPTION_CATALOGSOURCE ?= $(OPERATOR_CATALOGSOURCE) ROOK_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE ?= $(OPERATOR_CATALOGSOURCE_NAMESPACE) PROMETHEUS_SUBSCRIPTION_NAME ?= $(PROMETHEUS_BUNDLE_NAME) PROMETHEUS_SUBSCRIPTION_PACKAGE ?= $(PROMETHEUS_BUNDLE_NAME) PROMETHEUS_SUBSCRIPTION_CHANNEL ?= beta -PROMETHEUS_SUBSCRIPTION_STARTINGCSV ?= $(PROMETHEUS_BUNDLE_NAME).$(PROMETHEUS_BUNDLE_IMG_TAG) +PROMETHEUS_SUBSCRIPTION_STARTINGCSV ?= $(PROMETHEUS_BUNDLE_NAME).$(PROMETHEUS_BUNDLE_VERSION) PROMETHEUS_SUBSCRIPTION_CATALOGSOURCE ?= $(OPERATOR_CATALOGSOURCE) PROMETHEUS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE ?= $(OPERATOR_CATALOGSOURCE_NAMESPACE) # kube rbac proxy image variables