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 b2ceac8f1 fix: support operator sharding in Camel K Helm chart with
custom release names in cluster-wide scope
b2ceac8f1 is described below
commit b2ceac8f108a9744ff57d68084a4fd9aa12e6463
Author: Timmy Mathew <[email protected]>
AuthorDate: Mon Mar 23 22:41:24 2026 +0100
fix: support operator sharding in Camel K Helm chart with custom release
names in cluster-wide scope
---
helm/camel-k/templates/operator-deployment.yaml | 8 ++--
helm/camel-k/templates/operator-svcs.yaml | 4 +-
helm/camel-k/templates/rbacs-common.yaml | 22 ++++-----
helm/camel-k/templates/rbacs-descoped.yaml | 64 ++++++++++++-------------
helm/camel-k/templates/rbacs-namespaced.yaml | 64 ++++++++++++-------------
5 files changed, 81 insertions(+), 81 deletions(-)
diff --git a/helm/camel-k/templates/operator-deployment.yaml
b/helm/camel-k/templates/operator-deployment.yaml
index 74c5e65d7..3b3112068 100644
--- a/helm/camel-k/templates/operator-deployment.yaml
+++ b/helm/camel-k/templates/operator-deployment.yaml
@@ -26,12 +26,12 @@ metadata:
annotations:
{{ toYaml . | nindent 4 }}
{{- end }}
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
spec:
replicas: 1
selector:
matchLabels:
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
strategy:
type: Recreate
template:
@@ -39,7 +39,7 @@ spec:
labels:
app: camel-k
camel.apache.org/component: operator
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
spec:
{{- if .Values.operator.imagePullSecrets }}
imagePullSecrets:
@@ -111,7 +111,7 @@ spec:
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
- serviceAccountName: camel-k-operator
+ serviceAccountName: {{ include "camel-k.fullname" . }}-operator
{{- with .Values.operator.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
diff --git a/helm/camel-k/templates/operator-svcs.yaml
b/helm/camel-k/templates/operator-svcs.yaml
index 5a670a06e..844689e23 100644
--- a/helm/camel-k/templates/operator-svcs.yaml
+++ b/helm/camel-k/templates/operator-svcs.yaml
@@ -18,7 +18,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: camel-k-operator
+ name: {{ include "camel-k.fullname" . }}-operator
labels:
app: "camel-k"
{{- include "camel-k.labels" . | nindent 4 }}
@@ -32,6 +32,6 @@ metadata:
apiVersion: v1
kind: ServiceAccount
metadata:
- name: camel-k-builder
+ name: {{ include "camel-k.fullname" . }}-builder
labels:
app: "camel-k"
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 }}
