From 8727c462e7d667c5a1ee468d3031097aeeba3048 Mon Sep 17 00:00:00 2001 From: Claudio Miranda Date: Tue, 29 Aug 2023 13:59:19 -0300 Subject: [PATCH] Fix: Helm roles and doc (#4696) Bring helm roles update from main branch --- config/rbac/operator-role.yaml | 3 +- .../ROOT/pages/contributing/developers.adoc | 25 +++++++++++++--- .../templates/operator-cluster-roles.yaml | 25 +++++++++++----- helm/camel-k/templates/operator-role.yaml | 30 ++++++++++++++++--- 4 files changed, 67 insertions(+), 16 deletions(-) diff --git a/config/rbac/operator-role.yaml b/config/rbac/operator-role.yaml index 5c01d853d4..4ddc2d4c17 100644 --- a/config/rbac/operator-role.yaml +++ b/config/rbac/operator-role.yaml @@ -184,4 +184,5 @@ rules: resources: - namespaces verbs: - - get \ No newline at end of file + - get + - list diff --git a/docs/modules/ROOT/pages/contributing/developers.adoc b/docs/modules/ROOT/pages/contributing/developers.adoc index fcd57bdaf5..1e4dccc808 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.0.1-SNAPSHOT.tgz --set platform.build.registry.address=${REGISTRY_ADDRESS} --set platform.build.registry.insecure=true --set operator.image=apache/camel-k:2.0.1-SNAPSHOT +``` + +To uninstall: `helm uninstall camel-k-dev` + === Use Now you can play with Camel K: diff --git a/helm/camel-k/templates/operator-cluster-roles.yaml b/helm/camel-k/templates/operator-cluster-roles.yaml index e1dccd4787..9dba288c5e 100644 --- a/helm/camel-k/templates/operator-cluster-roles.yaml +++ b/helm/camel-k/templates/operator-cluster-roles.yaml @@ -35,7 +35,9 @@ rules: - integrationkits - integrationplatforms - integrations - - bindings + - pipes + # Deprecated: kameletbindings CR + - kameletbindings - kamelets verbs: - create @@ -55,8 +57,11 @@ rules: - integrationplatforms/status - integrations/scale - integrations/status - - bindings/scale - - bindings/status + - pipes/status + - pipes/scale + # Deprecated: kameletbindings CR + - kameletbindings/status + - kameletbindings/scale - kamelets/status verbs: - get @@ -81,7 +86,9 @@ rules: - integrationkits - integrationplatforms - integrations - - bindings + - pipes + # Deprecated: kameletbindings CR + - kameletbindings - kamelets verbs: - create @@ -105,8 +112,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 @@ -403,7 +413,8 @@ rules: - integrationkits/finalizers - integrationplatforms/finalizers - integrations/finalizers - - bindings/finalizers + - pipes/finalizers + - kameletbindings/finalizers verbs: - update - apiGroups: diff --git a/helm/camel-k/templates/operator-role.yaml b/helm/camel-k/templates/operator-role.yaml index 0c52d01d03..c923a28f75 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 + # Deprecated: kameletbindings CR + - kameletbindings - kamelets verbs: - create @@ -41,6 +43,13 @@ rules: - patch - update - watch +- apiGroups: + - "" + resources: + - namespaces + verbs: + - get + - list - apiGroups: - camel.apache.org resources: @@ -56,8 +65,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 +104,7 @@ rules: - "" resources: - pods/proxy + - pods/log verbs: - get - apiGroups: @@ -111,6 +124,7 @@ rules: resources: - roles - rolebindings + - clusterrolebindings verbs: - create - delete @@ -167,6 +181,13 @@ rules: - patch - update - watch +- apiGroups: + - storage.k8s.io + resources: + - storageclasses + verbs: + - get + - list - apiGroups: - "" resources: @@ -256,7 +277,8 @@ rules: - integrationkits/finalizers - integrationplatforms/finalizers - integrations/finalizers - - bindings/finalizers + - pipes/finalizers + - kameletbindings/finalizers verbs: - update - apiGroups: