This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch release-2.3.x in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 3bcedbf9a3b75e2a33cf3ba3be27bdc243800940 Author: Pasquale Congiusti <[email protected]> AuthorDate: Tue Apr 9 11:52:48 2024 +0200 fix(olm): set minKubeVersion and Openshift version Closes #5333 --- .../config/manifests/bases/camel-k.clusterserviceversion.yaml | 2 +- script/Makefile | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/resources/config/manifests/bases/camel-k.clusterserviceversion.yaml b/pkg/resources/config/manifests/bases/camel-k.clusterserviceversion.yaml index 062a26bf2..ea2a6eb5a 100644 --- a/pkg/resources/config/manifests/bases/camel-k.clusterserviceversion.yaml +++ b/pkg/resources/config/manifests/bases/camel-k.clusterserviceversion.yaml @@ -172,7 +172,7 @@ spec: - email: [email protected] name: The Apache Software Foundation maturity: alpha - minKubeVersion: 1.11.0 + minKubeVersion: 1.24.0 provider: name: The Apache Software Foundation replaces: camel-k-operator.v2.3.2 diff --git a/script/Makefile b/script/Makefile index b93b11303..731a35733 100644 --- a/script/Makefile +++ b/script/Makefile @@ -645,6 +645,9 @@ ifneq ($(origin PACKAGE), undefined) BUNDLE_PACKAGE := --package=$(PACKAGE) endif BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL) $(BUNDLE_PACKAGE) +# TODO automate these configuration retrieving the content from go.mod +BUNDLE_METADATA_OPENSHIFT_VERSION ?= "v4.14" +MIN_KUBE_VERSION ?= "1.24.0" # # Tailor the manifest according to default values for this project @@ -658,6 +661,7 @@ pre-bundle: @sed -i 's/^ name: .*.\(v.*\)/ name: $(CSV_NAME)/' $(CSV_PATH) @sed -i 's/^ displayName: .*/ displayName: $(CSV_DISPLAY_NAME)/' $(CSV_PATH) @sed -i 's/^ version: .*/ version: $(CSV_VERSION)/' $(CSV_PATH) + @sed -i 's/^ minKubeVersion: .*/ minKubeVersion: $(MIN_KUBE_VERSION)/' $(CSV_PATH) @if grep -q replaces $(CSV_PATH); \ then sed -i 's/^ replaces: .*/ replaces: $(CSV_REPLACES)/' $(CSV_PATH); \ else sed -i '/ version: ${CSV_VERSION}/a \ \ replaces: $(CSV_REPLACES)' $(CSV_PATH); \ @@ -680,6 +684,7 @@ bundle: set-version kustomize operator-sdk pre-bundle $(BUNDLE_CAMEL_APIS) # Rename the CSV name to conform with the existing released operator versions # This cannot happen in pre-bundle as the operator-sdk generation expects a CSV name the same as PACKAGE @sed -i "s/^ name: $(CSV_NAME)/ name: $(CSV_PRODUCTION_NAME)/" $(CSV_PRODUCTION_PATH) + @echo " com.redhat.openshift.versions : $(BUNDLE_METADATA_OPENSHIFT_VERSION)" >> ./bundle/metadata/annotations.yaml $(OPERATOR_SDK) bundle validate ./bundle # Build the bundle image.
