This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new d5a80e432 fix(olm): set minKubeVersion and Openshift version
d5a80e432 is described below
commit d5a80e43266b1a6c587ff5738cb5c976d7700bc7
Author: Pasquale Congiusti <pasquale.congiu...@gmail.com>
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 | 4 ++--
script/Makefile | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git
a/pkg/resources/config/manifests/bases/camel-k.clusterserviceversion.yaml
b/pkg/resources/config/manifests/bases/camel-k.clusterserviceversion.yaml
index 05f639f3f..72d77ff4c 100644
--- a/pkg/resources/config/manifests/bases/camel-k.clusterserviceversion.yaml
+++ b/pkg/resources/config/manifests/bases/camel-k.clusterserviceversion.yaml
@@ -23,7 +23,7 @@ metadata:
categories: Integration & Delivery
certified: "false"
containerImage: docker.io/apache/camel-k:2.4.0-SNAPSHOT
- createdAt: 2024-04-08T13:18:44Z
+ createdAt: 2024-04-09T09:51:41Z
description: Apache Camel K is a lightweight integration platform, born on
Kubernetes,
with serverless superpowers.
operators.operatorframework.io/builder: operator-sdk-v1.16.0
@@ -167,7 +167,7 @@ spec:
- email: us...@camel.apache.org
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.0
diff --git a/script/Makefile b/script/Makefile
index 36df380eb..f5fa156d1 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.
