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/01 12:26:35 UTC
[camel-k] branch main updated: Fix missing role in helm chart
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 06a087aa1 Fix missing role in helm chart
06a087aa1 is described below
commit 06a087aa1c2a0c834300104b3d2e037b49402ec2
Author: Claudio Miranda <cl...@claudius.com.br>
AuthorDate: Mon Jul 31 17:50:27 2023 -0300
Fix missing role in helm chart
Fix https://github.com/apache/camel-k/issues/4629
- Also improve doc about helm and minikube installation
---
.../ROOT/pages/contributing/developers.adoc | 25 ++++++++++++++++++----
helm/camel-k/templates/operator-role.yaml | 20 ++++++++++++++---
2 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/docs/modules/ROOT/pages/contributing/developers.adoc b/docs/modules/ROOT/pages/contributing/developers.adoc
index fcd57bdaf..5629b98ce 100644
--- a/docs/modules/ROOT/pages/contributing/developers.adoc
+++ b/docs/modules/ROOT/pages/contributing/developers.adoc
@@ -83,8 +83,8 @@ This executes a full build of the Go code. If you need to build the components s
Currently the build is not entirely supported on Windows. If you're building on a Windows system, here's a temporary workaround:
- 1. Copy the `script/Makefile` to the root of the project.
- 2. Run `make -f script/Makefile`.
+ 1. Copy the `script/Makefile` to the root of the project.
+ 2. Run `make -f script/Makefile`.
3. If the above command fails, run `make build-kamel`.
4. Rename the `kamel` binary in the root to `kamel.exe`.
@@ -135,9 +135,12 @@ The commands assume you have an already running CRC instance and logged in corre
=== For Minikube
-* Run `make install-minikube`: to build the project and install it in the current namespace on Minikube
+First remove any camel k operator you may have installed, otherwise it will conflict with the new one we will build and install.
-This command assumes you have an already running Minikube instance with registry enabled (can be enabled with `minikube addons enable registry`) and no previous Camel K instance installed.
+* Enable the `registry` minikube addon: `minikube addons enable registry`
+* Set the access to the internal minikube registry: `eval $(minikube docker-env)`
+* Run `make images`: to build the project and install the image in the internal minikube registry
+* Install camel-k-operator: `./kamel install`
=== For remote Kubernetes/OpenShift clusters
@@ -150,6 +153,20 @@ kamel install --operator-image=docker.io/myrepo/camel-k:1.5.0-SNAPSHOT --operato
Note `--olm=false` is necessary as otherwise the OLM bundle version is preferred.
+=== Local Helm installation
+
+If you want to test Helm installation
+
+* Build the Helm chart `make release-helm`
+* Build the project and the image: `make images`
+* Set the internal registry `export REGISTRY_ADDRESS=$(kubectl -n kube-system get service registry -o jsonpath='{.spec.clusterIP}')`
+* Install with Helm (look at the latest version produced by `make release-helm`)
+```
+ helm install camel-k-dev docs/charts/camel-k-2.1.0-SNAPSHOT.tgz --set platform.build.registry.address=${REGISTRY_ADDRESS} --set platform.build.registry.insecure=true --set operator.image=apache/camel-k:2.1.0-SNAPSHOT
+```
+
+To uninstall: `helm uninstall camel-k-dev`
+
=== Use
Now you can play with Camel K:
diff --git a/helm/camel-k/templates/operator-role.yaml b/helm/camel-k/templates/operator-role.yaml
index 0c52d01d0..e84757173 100644
--- a/helm/camel-k/templates/operator-role.yaml
+++ b/helm/camel-k/templates/operator-role.yaml
@@ -32,7 +32,9 @@ rules:
- integrationkits
- integrationplatforms
- integrations
- - bindings
+ - pipes
+ - kameletbindings
+ # Deprecated: kameletbindings CR
- kamelets
verbs:
- create
@@ -56,8 +58,11 @@ rules:
- integrationplatforms/status
- integrations/scale
- integrations/status
- - bindings/status
- - bindings/scale
+ - pipes/status
+ - pipes/scale
+ # Deprecated: kameletbindings CR
+ - kameletbindings/status
+ - kameletbindings/scale
- kamelets/status
verbs:
- get
@@ -92,6 +97,7 @@ rules:
- ""
resources:
- pods/proxy
+ - pods/log
verbs:
- get
- apiGroups:
@@ -111,6 +117,7 @@ rules:
resources:
- roles
- rolebindings
+ - clusterrolebindings
verbs:
- create
- delete
@@ -167,6 +174,13 @@ rules:
- patch
- update
- watch
+- apiGroups:
+ - storage.k8s.io
+ resources:
+ - storageclasses
+ verbs:
+ - get
+ - list
- apiGroups:
- ""
resources: