From e4848b5022ee6d671b273265a98ae9b2e29766f5 Mon Sep 17 00:00:00 2001
From: Roger Siegenthaler <siegenthalerroger@users.noreply.github.com>
Date: Tue, 14 Nov 2023 14:26:11 +0100
Subject: [PATCH] helm chart: align labeling of rbac resources (#1299)

---
 deploy/helm/grafana-operator/templates/rbac.yaml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/deploy/helm/grafana-operator/templates/rbac.yaml b/deploy/helm/grafana-operator/templates/rbac.yaml
index f2972b912..2311fe385 100644
--- a/deploy/helm/grafana-operator/templates/rbac.yaml
+++ b/deploy/helm/grafana-operator/templates/rbac.yaml
@@ -11,10 +11,11 @@ kind: {{ if not $namespaceScoped }}Cluster{{ end }}Role
 metadata:
   namespace: {{ . }}
   name: grafana-operator-permissions
-  {{- with (merge $.Values.additionalLabels (include "grafana-operator.labels" $ | fromYaml)) }}
   labels:
+    {{- include "grafana-operator.labels" $ | nindent 4 }}
+    {{- with $.Values.additionalLabels }}
     {{- toYaml . | nindent 4 }}
-  {{- end }}
+    {{- end }}
 rules:
   - apiGroups:
       - ""
@@ -231,10 +232,11 @@ kind: {{ if not $namespaceScoped }}Cluster{{ end }}RoleBinding
 metadata:
   name: grafana-operator-permissions
   namespace: {{ . }}
-  {{- with (merge $.Values.additionalLabels (include "grafana-operator.labels" $ | fromYaml)) }}
   labels:
+    {{- include "grafana-operator.labels" $ | nindent 4 }}
+    {{- with $.Values.additionalLabels }}
     {{- toYaml . | nindent 4 }}
-  {{- end }}
+    {{- end }}
 subjects:
   - kind: ServiceAccount
     name: {{ include "grafana-operator.serviceAccountName" $ }}