Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(ci): product adjustments #193

Merged
merged 2 commits into from
Apr 23, 2024
Merged

fix(ci): product adjustments #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cb8476
fix(ci): product adjustments
squakez Apr 23, 2024
5814cc7
fix(olm): set minKubeVersion and Openshift version
squakez Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions pkg/resources/config/manifests/bases/camel-k.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ metadata:
operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
repository: https://github.com/apache/camel-k
support: Camel
name: camel-k.v2.3.1
name: camel-k.vx.y.z
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -169,14 +169,15 @@ spec:
- name: Camel K source code repository
url: https://github.com/apache/camel-k
maintainers:
- email: users@camel.apache.org
name: The Apache Software Foundation
- email: pcongius@redhat.com
name: Pasquale Congiusti
maturity: alpha
minKubeVersion: 1.11.0
minKubeVersion: 1.24.0
provider:
name: The Apache Software Foundation
replaces: camel-k-operator.v2.3.0
name: Red Hat
url: https://access.redhat.com/products/red-hat-integration
replaces: red-hat-camel-k-operator.vX.Y.Z
selector:
matchLabels:
name: camel-k-operator
version: 2.3.1
version: X.Y.Z
9 changes: 8 additions & 1 deletion script/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
VERSIONFILE := pkg/util/defaults/defaults.go
VERSION ?= 2.3.0
LAST_RELEASED_IMAGE_NAME := red-hat-camel-k-operator
LAST_RELEASED_VERSION := 2.2.0
LAST_RELEASED_VERSION := 1.10.6
DEFAULT_RUNTIME_VERSION ?= 3.8.1
BUILDAH_VERSION := 1.14.0
KANIKO_VERSION := 0.17.1
Expand Down Expand Up @@ -538,6 +538,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.12"
MIN_KUBE_VERSION ?= "1.24.0"

#
# Tailor the manifest according to default values for this project
Expand All @@ -553,6 +556,7 @@ pre-bundle:
@sed -i 's/^ displayName: .*/ displayName: $(CSV_DISPLAY_NAME)/' $(CSV_PATH)
@sed -i 's/^ replaces: .*/ replaces: $(CSV_REPLACES)/' $(CSV_PATH)
@sed -i 's/^ version: .*/ version: $(CSV_VERSION)/' $(CSV_PATH)
@sed -i 's/^ minKubeVersion: .*/ minKubeVersion: $(MIN_KUBE_VERSION)/' $(CSV_PATH)

bundle: set-version generate-crd kustomize operator-sdk pre-bundle $(BUNDLE_CAMEL_APIS)
@# Sets the operator image to the preferred image:tag
Expand All @@ -570,6 +574,9 @@ else
endif
@# Adds the licence headers to the csv file
./script/add_license.sh bundle/manifests ./script/headers/yaml.txt
# 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
@echo " com.redhat.openshift.versions : $(BUNDLE_METADATA_OPENSHIFT_VERSION)" >> ./bundle/metadata/annotations.yaml
$(OPERATOR_SDK) bundle validate ./bundle
# operator-sdk requires the name of the operator to be the PACKAGE
# However, the historical name of the operator has the suffix 'operator' so this should
Expand Down
Loading