Allow to add annotations to the serviceacount (#17818)

Signed-off-by: Mickaël Canévet <mickael.canevet@camptocamp.com>
This commit is contained in:
Mickaël Canévet
2019-10-09 05:43:51 -07:00
committed by Kubernetes Prow Robot
parent 60a65099d5
commit 5ae4ae3034
3 changed files with 6 additions and 1 deletions
+1 -1
View File
@@ -10,7 +10,7 @@ name: prometheus-operator
sources:
- https://github.com/coreos/prometheus-operator
- https://coreos.com/operators/prometheus
version: 6.14.2
version: 6.15.0
appVersion: 0.32.0
home: https://github.com/coreos/prometheus-operator
keywords:
+1
View File
@@ -299,6 +299,7 @@ The following tables list the configurable parameters of the prometheus-operator
| `prometheus.service.type` | Prometheus Service type | `ClusterIP` |
| `prometheus.serviceAccount.create` | Create a default serviceaccount for prometheus to use | `true` |
| `prometheus.serviceAccount.name` | Name for prometheus serviceaccount | `""` |
| `prometheus.serviceAccount.annotations` | Annotations to add to the serviceaccount | `""` |
| `prometheus.serviceMonitor.interval` | Scrape interval. If not set, the Prometheus default scrape interval is used | `nil` |
| `prometheus.serviceMonitor.metricRelabelings` | The `metric_relabel_configs` for scraping the prometheus instance. | `` |
| `prometheus.serviceMonitor.relabelings` | The `relabel_configs` for scraping the prometheus instance. | `` |
@@ -7,6 +7,10 @@ metadata:
labels:
app: {{ template "prometheus-operator.name" . }}-prometheus
{{ include "prometheus-operator.labels" . | indent 4 }}
{{- if .Values.prometheus.serviceAccount.annotations }}
annotations:
{{ toYaml .Values.prometheus.serviceAccount.annotations | indent 4 }}
{{- end }}
imagePullSecrets:
{{ toYaml .Values.global.imagePullSecrets | indent 2 }}
{{- end }}