Skip to content

Commit

Permalink
Merge branch 'master' into enable_image_digest
Browse files Browse the repository at this point in the history
  • Loading branch information
pb82 authored Nov 14, 2023
2 parents 26e13b1 + e4848b5 commit 3e89267
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions deploy/helm/grafana-operator/templates/rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
- ""
Expand Down Expand Up @@ -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" $ }}
Expand Down

0 comments on commit 3e89267

Please sign in to comment.