[helm/prometheus] Custom ServiceAccountName when rbac disabled (#1230)

* Allows custom serviceAccountName value

* Adapt best practices for serviceAccount

helm/kube-prometheus/Chart.yaml

@@ -9,4 +9,4 @@ maintainers:
 name: kube-prometheus
 sources:
   - https://github.com/coreos/prometheus-operator
-version: 0.0.52
+version: 0.0.53

helm/kube-prometheus/requirements.yaml

@@ -6,7 +6,7 @@ dependencies:
     condition: deployAlertManager
 
   - name: prometheus
-    version: 0.0.27
+    version: 0.0.28
     #e2e-repository: file://../prometheus
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
 

helm/prometheus/Chart.yaml

@@ -7,4 +7,4 @@ maintainers:
 name: prometheus
 sources:
   - https://github.com/coreos/prometheus-operator
-version: 0.0.27
+version: 0.0.28

helm/prometheus/templates/_helpers.tpl

@@ -34,3 +34,14 @@ Return the appropriate apiVersion value to use for the prometheus-operator manag
 {{- printf "%s" "monitoring.coreos.com/v1alpha1" -}}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "prometheus.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create -}}
+    {{ default (include "prometheus.fullname" .) .Values.serviceAccount.name }}
+{{- else -}}
+    {{ default "default" .Values.serviceAccount.name }}
+{{- end -}}
+{{- end -}}

helm/prometheus/templates/prometheus.yaml

@@ -53,7 +53,7 @@ spec:
 {{ toYaml .Values.secrets | indent 4 }}
 {{- end }}
 {{- if .Values.global.rbacEnable }}
-  serviceAccountName: {{ template "prometheus.fullname" . }}
+  serviceAccountName: {{ template "prometheus.serviceAccountName" .}}
 {{- end }}
 {{ if and .Values.config.specifiedInValues .Values.config.value }}
 {{- else if .Values.serviceMonitorsSelector }}

helm/prometheus/templates/serviceaccount.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.global.rbacEnable }}
+{{- if and .Values.global.rbacEnable .Values.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -7,5 +7,5 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-  name: {{ template "prometheus.fullname" . }}
+  name: {{ template "prometheus.serviceAccountName" .}}
 {{- end }}

helm/prometheus/values.yaml

@@ -97,6 +97,12 @@ paused: false
 global:
   rbacEnable: true
 
+## serviceAccount to use by Prometheus
+##
+serviceAccount:
+  create: true
+  name: ""
+
 ## Number of Prometheus replicas desired
 ##
 replicaCount: 1