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.

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

Fix: Helm roles and doc (2.0.x) #4696

Merged
merged 1 commit into from
Aug 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion config/rbac/operator-role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -184,4 +184,5 @@ rules:
resources:
- namespaces
verbs:
- get
- get
- list
25 changes: 21 additions & 4 deletions docs/modules/ROOT/pages/contributing/developers.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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`.

Expand Down Expand Up @@ -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

Expand All @@ -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:
Expand Down
25 changes: 18 additions & 7 deletions helm/camel-k/templates/operator-cluster-roles.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ rules:
- integrationkits
- integrationplatforms
- integrations
- bindings
- pipes
# Deprecated: kameletbindings CR
- kameletbindings
- kamelets
verbs:
- create
Expand All @@ -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
Expand All @@ -81,7 +86,9 @@ rules:
- integrationkits
- integrationplatforms
- integrations
- bindings
- pipes
# Deprecated: kameletbindings CR
- kameletbindings
- kamelets
verbs:
- create
Expand All @@ -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
Expand Down Expand Up @@ -403,7 +413,8 @@ rules:
- integrationkits/finalizers
- integrationplatforms/finalizers
- integrations/finalizers
- bindings/finalizers
- pipes/finalizers
- kameletbindings/finalizers
verbs:
- update
- apiGroups:
Expand Down
30 changes: 26 additions & 4 deletions helm/camel-k/templates/operator-role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ rules:
- integrationkits
- integrationplatforms
- integrations
- bindings
- pipes
# Deprecated: kameletbindings CR
- kameletbindings
- kamelets
verbs:
- create
Expand All @@ -41,6 +43,13 @@ rules:
- patch
- update
- watch
- apiGroups:
- ""
resources:
- namespaces
verbs:
- get
- list
- apiGroups:
- camel.apache.org
resources:
Expand All @@ -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
Expand Down Expand Up @@ -92,6 +104,7 @@ rules:
- ""
resources:
- pods/proxy
- pods/log
verbs:
- get
- apiGroups:
Expand All @@ -111,6 +124,7 @@ rules:
resources:
- roles
- rolebindings
- clusterrolebindings
verbs:
- create
- delete
Expand Down Expand Up @@ -167,6 +181,13 @@ rules:
- patch
- update
- watch
- apiGroups:
- storage.k8s.io
resources:
- storageclasses
verbs:
- get
- list
- apiGroups:
- ""
resources:
Expand Down Expand Up @@ -256,7 +277,8 @@ rules:
- integrationkits/finalizers
- integrationplatforms/finalizers
- integrations/finalizers
- bindings/finalizers
- pipes/finalizers
- kameletbindings/finalizers
verbs:
- update
- apiGroups:
Expand Down