You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2023/08/02 07:42:15 UTC
[camel-k] branch main updated: chore(olm): bundle channel
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 d24e5f640 chore(olm): bundle channel
d24e5f640 is described below
commit d24e5f6400d816684dc7b3fea5c58c6e7551fd10
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Wed Aug 2 09:38:37 2023 +0200
chore(olm): bundle channel
---
docs/modules/ROOT/pages/installation/installation.adoc | 10 ++--------
script/Makefile | 5 ++---
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/docs/modules/ROOT/pages/installation/installation.adoc b/docs/modules/ROOT/pages/installation/installation.adoc
index 694bbb5b4..ebd4bfcb9 100644
--- a/docs/modules/ROOT/pages/installation/installation.adoc
+++ b/docs/modules/ROOT/pages/installation/installation.adoc
@@ -49,19 +49,13 @@ More information on the xref:installation/advanced/kustomize.adoc[Kustomize Came
[[olm]]
== Installation via Operator Hub
-Camel K is also available in Operator Hub:
+Camel K is also available in Operator Hub. You will need to OLM framework to be properly installed in your cluster. More instructions on the https://operatorhub.io/operator/camel-k[Camel K Operator Hub] page.
```
$ kubectl create -f https://operatorhub.io/install/camel-k.yaml
```
-You will need to OLM framework to be properly installed in your cluster. More instructions on the https://operatorhub.io/operator/camel-k[Camel K Operator Hub] page.
-
-As an alternative, you can also use the `kamel` CLI to perform the same installation:
-
-```
-$ kamel install --olm=true
-```
+You can edit the `Subscription` custom resource, setting the channel you want to use. From Camel K version 2 onward, we're going to provide an installation channel for each major version we're releasing (ie, `stable-v2`). This will simplify the upgrade process if you choose to perform an automatic upgrade.
NOTE: Some Kubernetes clusters such as Openshift (or CRC) may let you to perform the same operation from a GUI as well. Refer to the cluster instruction to learn how to perform such action.
diff --git a/script/Makefile b/script/Makefile
index d26967e84..f4ea4aa87 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -58,8 +58,8 @@ DEBUG_MODE ?= false
# olm bundle vars
MANAGER := config/manager
MANIFESTS := config/manifests
-CHANNELS ?= $(shell v=$(OPERATOR_VERSION) && echo "stable-$${v%\.[0-9]}"),candidate,latest
-DEFAULT_CHANNEL ?= $(shell v=$(OPERATOR_VERSION) && echo "stable-$${v%\.[0-9]}")
+DEFAULT_CHANNEL ?= $(shell echo "stable-v$(word 1,$(subst ., ,$(lastword $(OPERATOR_VERSION))))")
+CHANNELS ?= $(DEFAULT_CHANNEL),latest
PACKAGE := camel-k
CSV_VERSION := $(OPERATOR_VERSION)
CSV_NAME := $(PACKAGE).v$(CSV_VERSION)
@@ -578,7 +578,6 @@ endif
operator-sdk: detect-os
@echo "####### Installing operator-sdk version $(OPERATOR_SDK_VERSION)..."
- set -e ;\
curl \
-s -L https://github.com/operator-framework/operator-sdk/releases/download/$(OPERATOR_SDK_VERSION)/operator-sdk_$(OS_LOWER)_amd64 \
-o operator-sdk ; \