This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch release-2.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/release-2.10.x by this push:
new 485364a17 fix(ci): helm autogen resources
485364a17 is described below
commit 485364a17d663d696dd77b7b23e546ebb77faab7
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Thu Apr 9 09:33:43 2026 +0200
fix(ci): helm autogen resources
---
helm/camel-k/templates/rbacs-common.yaml | 22 +++++-----
helm/camel-k/templates/rbacs-descoped.yaml | 64 ++++++++++++++--------------
helm/camel-k/templates/rbacs-namespaced.yaml | 64 ++++++++++++++--------------
script/gen_helm.sh | 5 +++
4 files changed, 80 insertions(+), 75 deletions(-)
diff --git a/helm/camel-k/templates/rbacs-common.yaml
b/helm/camel-k/templates/rbacs-common.yaml
index f63ab9031..51c4a7f99 100644
--- a/helm/camel-k/templates/rbacs-common.yaml
+++ b/helm/camel-k/templates/rbacs-common.yaml
@@ -19,7 +19,7 @@ kind: Role
metadata:
labels:
app: camel-k
- name: camel-k-builder
+ name: {{ include "camel-k.fullname" . }}-builder
rules:
- apiGroups:
- camel.apache.org
@@ -61,7 +61,7 @@ kind: Role
metadata:
labels:
app: camel-k
- name: camel-k-builder-openshift
+ name: {{ include "camel-k.fullname" . }}-builder-openshift
rules:
- apiGroups:
- ""
@@ -112,7 +112,7 @@ kind: Role
metadata:
labels:
app: camel-k
- name: camel-k-kamelet-viewer
+ name: {{ include "camel-k.fullname" . }}-kamelet-viewer
rules:
- apiGroups:
- camel.apache.org
@@ -128,39 +128,39 @@ kind: RoleBinding
metadata:
labels:
app: camel-k
- name: camel-k-builder
+ name: {{ include "camel-k.fullname" . }}-builder
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
- name: camel-k-builder
+ name: {{ include "camel-k.fullname" . }}-builder
subjects:
- kind: ServiceAccount
- name: camel-k-builder
+ name: {{ include "camel-k.fullname" . }}-builder
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
app: camel-k
- name: camel-k-builder-openshift
+ name: {{ include "camel-k.fullname" . }}-builder-openshift
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
- name: camel-k-builder-openshift
+ name: {{ include "camel-k.fullname" . }}-builder-openshift
subjects:
- kind: ServiceAccount
- name: camel-k-builder
+ name: {{ include "camel-k.fullname" . }}-builder
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
app: camel-k
- name: camel-k-kamelet-viewer
+ name: {{ include "camel-k.fullname" . }}-kamelet-viewer
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
- name: camel-k-kamelet-viewer
+ name: {{ include "camel-k.fullname" . }}-kamelet-viewer
subjects:
- apiGroup: rbac.authorization.k8s.io
kind: Group
diff --git a/helm/camel-k/templates/rbacs-descoped.yaml
b/helm/camel-k/templates/rbacs-descoped.yaml
index 90c73df55..7424869a8 100644
--- a/helm/camel-k/templates/rbacs-descoped.yaml
+++ b/helm/camel-k/templates/rbacs-descoped.yaml
@@ -20,7 +20,7 @@ kind: ClusterRole
metadata:
labels:
app: camel-k
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
rules:
- apiGroups:
- camel.apache.org
@@ -221,7 +221,7 @@ kind: ClusterRole
metadata:
labels:
app: camel-k
- name: camel-k-operator-events
+ name: {{ include "camel-k.fullname" . }}-operator-events
rules:
- apiGroups:
- ""
@@ -240,7 +240,7 @@ kind: ClusterRole
metadata:
labels:
app: camel-k
- name: camel-k-operator-keda
+ name: {{ include "camel-k.fullname" . }}-operator-keda
rules:
- apiGroups:
- keda.sh
@@ -259,7 +259,7 @@ kind: ClusterRole
metadata:
labels:
app: camel-k
- name: camel-k-operator-knative
+ name: {{ include "camel-k.fullname" . }}-operator-knative
rules:
- apiGroups:
- serving.knative.dev
@@ -318,7 +318,7 @@ kind: ClusterRole
metadata:
labels:
app: camel-k
- name: camel-k-operator-leases
+ name: {{ include "camel-k.fullname" . }}-operator-leases
rules:
- apiGroups:
- coordination.k8s.io
@@ -338,7 +338,7 @@ kind: ClusterRole
metadata:
labels:
app: camel-k
- name: camel-k-operator-openshift
+ name: {{ include "camel-k.fullname" . }}-operator-openshift
rules:
- apiGroups:
- camel.apache.org
@@ -427,7 +427,7 @@ kind: ClusterRole
metadata:
labels:
app: camel-k
- name: camel-k-operator-podmonitors
+ name: {{ include "camel-k.fullname" . }}-operator-podmonitors
rules:
- apiGroups:
- monitoring.coreos.com
@@ -445,7 +445,7 @@ kind: ClusterRole
metadata:
labels:
app: camel-k
- name: camel-k-operator-strimzi
+ name: {{ include "camel-k.fullname" . }}-operator-strimzi
rules:
- apiGroups:
- kafka.strimzi.io
@@ -462,14 +462,14 @@ kind: ClusterRoleBinding
metadata:
labels:
app: camel-k
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
subjects:
- kind: ServiceAccount
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
namespace: '{{ .Release.Namespace }}'
---
apiVersion: rbac.authorization.k8s.io/v1
@@ -477,14 +477,14 @@ kind: ClusterRoleBinding
metadata:
labels:
app: camel-k
- name: camel-k-operator-events
+ name: {{ include "camel-k.fullname" . }}-operator-events
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
- name: camel-k-operator-events
+ name: {{ include "camel-k.fullname" . }}-operator-events
subjects:
- kind: ServiceAccount
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
namespace: '{{ .Release.Namespace }}'
---
apiVersion: rbac.authorization.k8s.io/v1
@@ -492,14 +492,14 @@ kind: ClusterRoleBinding
metadata:
labels:
app: camel-k
- name: camel-k-operator-keda
+ name: {{ include "camel-k.fullname" . }}-operator-keda
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
- name: camel-k-operator-keda
+ name: {{ include "camel-k.fullname" . }}-operator-keda
subjects:
- kind: ServiceAccount
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
namespace: '{{ .Release.Namespace }}'
---
apiVersion: rbac.authorization.k8s.io/v1
@@ -507,14 +507,14 @@ kind: ClusterRoleBinding
metadata:
labels:
app: camel-k
- name: camel-k-operator-knative
+ name: {{ include "camel-k.fullname" . }}-operator-knative
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
- name: camel-k-operator-knative
+ name: {{ include "camel-k.fullname" . }}-operator-knative
subjects:
- kind: ServiceAccount
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
namespace: '{{ .Release.Namespace }}'
---
apiVersion: rbac.authorization.k8s.io/v1
@@ -522,14 +522,14 @@ kind: ClusterRoleBinding
metadata:
labels:
app: camel-k
- name: camel-k-operator-leases
+ name: {{ include "camel-k.fullname" . }}-operator-leases
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
- name: camel-k-operator-leases
+ name: {{ include "camel-k.fullname" . }}-operator-leases
subjects:
- kind: ServiceAccount
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
namespace: '{{ .Release.Namespace }}'
---
apiVersion: rbac.authorization.k8s.io/v1
@@ -537,14 +537,14 @@ kind: ClusterRoleBinding
metadata:
labels:
app: camel-k
- name: camel-k-operator-openshift
+ name: {{ include "camel-k.fullname" . }}-operator-openshift
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
- name: camel-k-operator-openshift
+ name: {{ include "camel-k.fullname" . }}-operator-openshift
subjects:
- kind: ServiceAccount
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
namespace: '{{ .Release.Namespace }}'
---
apiVersion: rbac.authorization.k8s.io/v1
@@ -552,14 +552,14 @@ kind: ClusterRoleBinding
metadata:
labels:
app: camel-k
- name: camel-k-operator-podmonitors
+ name: {{ include "camel-k.fullname" . }}-operator-podmonitors
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
- name: camel-k-operator-podmonitors
+ name: {{ include "camel-k.fullname" . }}-operator-podmonitors
subjects:
- kind: ServiceAccount
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
namespace: '{{ .Release.Namespace }}'
---
apiVersion: rbac.authorization.k8s.io/v1
@@ -567,13 +567,13 @@ kind: ClusterRoleBinding
metadata:
labels:
app: camel-k
- name: camel-k-operator-strimzi
+ name: {{ include "camel-k.fullname" . }}-operator-strimzi
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
- name: camel-k-operator-strimzi
+ name: {{ include "camel-k.fullname" . }}-operator-strimzi
subjects:
- kind: ServiceAccount
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
namespace: '{{ .Release.Namespace }}'
{{- end }}
diff --git a/helm/camel-k/templates/rbacs-namespaced.yaml
b/helm/camel-k/templates/rbacs-namespaced.yaml
index f93af2304..769bcc6a1 100644
--- a/helm/camel-k/templates/rbacs-namespaced.yaml
+++ b/helm/camel-k/templates/rbacs-namespaced.yaml
@@ -20,7 +20,7 @@ kind: Role
metadata:
labels:
app: camel-k
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
rules:
- apiGroups:
- camel.apache.org
@@ -215,7 +215,7 @@ kind: Role
metadata:
labels:
app: camel-k
- name: camel-k-operator-events
+ name: {{ include "camel-k.fullname" . }}-operator-events
rules:
- apiGroups:
- ""
@@ -234,7 +234,7 @@ kind: Role
metadata:
labels:
app: camel-k
- name: camel-k-operator-keda
+ name: {{ include "camel-k.fullname" . }}-operator-keda
rules:
- apiGroups:
- keda.sh
@@ -253,7 +253,7 @@ kind: Role
metadata:
labels:
app: camel-k
- name: camel-k-operator-knative
+ name: {{ include "camel-k.fullname" . }}-operator-knative
rules:
- apiGroups:
- serving.knative.dev
@@ -312,7 +312,7 @@ kind: Role
metadata:
labels:
app: camel-k
- name: camel-k-operator-leases
+ name: {{ include "camel-k.fullname" . }}-operator-leases
rules:
- apiGroups:
- coordination.k8s.io
@@ -332,7 +332,7 @@ kind: Role
metadata:
labels:
app: camel-k
- name: camel-k-operator-openshift
+ name: {{ include "camel-k.fullname" . }}-operator-openshift
rules:
- apiGroups:
- camel.apache.org
@@ -421,7 +421,7 @@ kind: Role
metadata:
labels:
app: camel-k
- name: camel-k-operator-podmonitors
+ name: {{ include "camel-k.fullname" . }}-operator-podmonitors
rules:
- apiGroups:
- monitoring.coreos.com
@@ -439,7 +439,7 @@ kind: Role
metadata:
labels:
app: camel-k
- name: camel-k-operator-strimzi
+ name: {{ include "camel-k.fullname" . }}-operator-strimzi
rules:
- apiGroups:
- kafka.strimzi.io
@@ -456,110 +456,110 @@ kind: RoleBinding
metadata:
labels:
app: camel-k
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
subjects:
- kind: ServiceAccount
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
app: camel-k
- name: camel-k-operator-events
+ name: {{ include "camel-k.fullname" . }}-operator-events
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
- name: camel-k-operator-events
+ name: {{ include "camel-k.fullname" . }}-operator-events
subjects:
- kind: ServiceAccount
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
app: camel-k
- name: camel-k-operator-keda
+ name: {{ include "camel-k.fullname" . }}-operator-keda
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
- name: camel-k-operator-keda
+ name: {{ include "camel-k.fullname" . }}-operator-keda
subjects:
- kind: ServiceAccount
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
app: camel-k
- name: camel-k-operator-knative
+ name: {{ include "camel-k.fullname" . }}-operator-knative
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
- name: camel-k-operator-knative
+ name: {{ include "camel-k.fullname" . }}-operator-knative
subjects:
- kind: ServiceAccount
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
app: camel-k
- name: camel-k-operator-leases
+ name: {{ include "camel-k.fullname" . }}-operator-leases
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
- name: camel-k-operator-leases
+ name: {{ include "camel-k.fullname" . }}-operator-leases
subjects:
- kind: ServiceAccount
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
app: camel-k
- name: camel-k-operator-openshift
+ name: {{ include "camel-k.fullname" . }}-operator-openshift
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
- name: camel-k-operator-openshift
+ name: {{ include "camel-k.fullname" . }}-operator-openshift
subjects:
- kind: ServiceAccount
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
app: camel-k
- name: camel-k-operator-podmonitors
+ name: {{ include "camel-k.fullname" . }}-operator-podmonitors
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
- name: camel-k-operator-podmonitors
+ name: {{ include "camel-k.fullname" . }}-operator-podmonitors
subjects:
- kind: ServiceAccount
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
app: camel-k
- name: camel-k-operator-strimzi
+ name: {{ include "camel-k.fullname" . }}-operator-strimzi
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
- name: camel-k-operator-strimzi
+ name: {{ include "camel-k.fullname" . }}-operator-strimzi
subjects:
- kind: ServiceAccount
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
{{- end }}
diff --git a/script/gen_helm.sh b/script/gen_helm.sh
index 35b2c5f40..b1dbec10c 100755
--- a/script/gen_helm.sh
+++ b/script/gen_helm.sh
@@ -34,3 +34,8 @@ printf "{{- end }}\n" >>
./helm/camel-k/templates/rbacs-namespaced.yaml
printf "{{- if eq .Values.operator.global \"true\" }}\n" >>
./helm/camel-k/templates/rbacs-descoped.yaml
kustomize build ./pkg/resources/config/helm/descoped/. >>
./helm/camel-k/templates/rbacs-descoped.yaml
printf "{{- end }}\n" >> ./helm/camel-k/templates/rbacs-descoped.yaml
+
+# [Helm] Camel-K Operator sharding -
https://github.com/apache/camel-k/issues/6533
+sed -i -E "s/^([[:space:]]*)name: camel-k-(.*)$/\1name: {{ include
\"camel-k.fullname\" . }}-\2/" ./helm/camel-k/templates/rbacs-common.yaml
+sed -i -E "s/^([[:space:]]*)name: camel-k-(.*)$/\1name: {{ include
\"camel-k.fullname\" . }}-\2/" ./helm/camel-k/templates/rbacs-namespaced.yaml
+sed -i -E "s/^([[:space:]]*)name: camel-k-(.*)$/\1name: {{ include
\"camel-k.fullname\" . }}-\2/" ./helm/camel-k/templates/rbacs-descoped.yaml
