From 032f7d4450d4aa4141332b98e86f9805fd30bc0a Mon Sep 17 00:00:00 2001
From: Timmy Mathew <timmy.mathew@ah.nl>
Date: Mon, 23 Mar 2026 22:41:24 +0100
Subject: [PATCH] fix: support operator sharding in Camel K Helm chart with
 custom release names in cluster-wide scope

---
 .../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 74c5e65d73..3b3112068e 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 5a670a06ee..844689e234 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 f63ab90310..51c4a7f996 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 433a8046bf..52081c90b6 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
@@ -210,7 +210,7 @@ kind: ClusterRole
 metadata:
   labels:
     app: camel-k
-  name: camel-k-operator-events
+  name: {{ include "camel-k.fullname" . }}-operator-events
 rules:
 - apiGroups:
   - ""
@@ -229,7 +229,7 @@ kind: ClusterRole
 metadata:
   labels:
     app: camel-k
-  name: camel-k-operator-keda
+  name: {{ include "camel-k.fullname" . }}-operator-keda
 rules:
 - apiGroups:
   - keda.sh
@@ -248,7 +248,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
@@ -307,7 +307,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
@@ -327,7 +327,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
@@ -416,7 +416,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
@@ -434,7 +434,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
@@ -451,14 +451,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
@@ -466,14 +466,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
@@ -481,14 +481,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
@@ -496,14 +496,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
@@ -511,14 +511,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
@@ -526,14 +526,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
@@ -541,14 +541,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
@@ -556,13 +556,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 6395d14a6e..00c640f49d 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
@@ -204,7 +204,7 @@ kind: Role
 metadata:
   labels:
     app: camel-k
-  name: camel-k-operator-events
+  name: {{ include "camel-k.fullname" . }}-operator-events
 rules:
 - apiGroups:
   - ""
@@ -223,7 +223,7 @@ kind: Role
 metadata:
   labels:
     app: camel-k
-  name: camel-k-operator-keda
+  name: {{ include "camel-k.fullname" . }}-operator-keda
 rules:
 - apiGroups:
   - keda.sh
@@ -242,7 +242,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
@@ -301,7 +301,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
@@ -321,7 +321,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
@@ -410,7 +410,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
@@ -428,7 +428,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
@@ -445,110 +445,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 }}