From c574186d926ba988151a6eb5158ac99e4a7f3499 Mon Sep 17 00:00:00 2001 From: Matous Jobanek Date: Tue, 4 Feb 2025 14:31:21 +0100 Subject: [PATCH 1/2] expose --replace-version flag via REPLACE_OPERATOR_VERSION variable --- make/manifests.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/make/manifests.mk b/make/manifests.mk index 1b11566d..cfcf550a 100644 --- a/make/manifests.mk +++ b/make/manifests.mk @@ -19,7 +19,10 @@ generate-cd-release-manifests: ifneq (${OTHER_REPO_PATH},"") $(eval OTHER_REPO_PATH_PARAM = -orp ${OTHER_REPO_PATH}) endif - $(MAKE) run-cicd-script SCRIPT_PATH=scripts/cd/generate-cd-release-manifests.sh SCRIPT_PARAMS="-pr ../registration-service/ -mr https://github.com/codeready-toolchain/host-operator/ -qn ${QUAY_NAMESPACE} -td ${TMP_DIR} -fr ${FIRST_RELEASE} -ch ${CHANNEL} -il ${IMAGE} ${OTHER_REPO_PATH_PARAM}" +ifneq (${REPLACE_OPERATOR_VERSION},"") + $(eval REPLACE_OPERATOR_VERSION_PARAM = -rv ${REPLACE_OPERATOR_VERSION}) +endif + $(MAKE) run-cicd-script SCRIPT_PATH=scripts/cd/generate-cd-release-manifests.sh SCRIPT_PARAMS="-pr ../registration-service/ -mr https://github.com/codeready-toolchain/host-operator/ -qn ${QUAY_NAMESPACE} -td ${TMP_DIR} -fr ${FIRST_RELEASE} -ch ${CHANNEL} -il ${IMAGE} ${OTHER_REPO_PATH_PARAM} ${REPLACE_OPERATOR_VERSION_PARAM}" .PHONY: push-bundle-and-index-image ## Pushes generated manifests as a bundle image to quay and adds is to the image index From bb0caf91456a50b569e1c284b1fe240b71a60aeb Mon Sep 17 00:00:00 2001 From: Matous Jobanek Date: Tue, 4 Feb 2025 17:17:00 +0100 Subject: [PATCH 2/2] defaul value --- make/manifests.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/make/manifests.mk b/make/manifests.mk index cfcf550a..3de1383e 100644 --- a/make/manifests.mk +++ b/make/manifests.mk @@ -8,6 +8,7 @@ INDEX_IMAGE_TAG=latest NEXT_VERSION=0.0.1 OTHER_REPO_PATH="" BUNDLE_TAG="" +REPLACE_OPERATOR_VERSION="" .PHONY: push-to-quay-staging ## Creates a new version of operator bundle, adds it into an index and pushes it to quay