diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index dc9a312e9e..20d49dd46f 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -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: diff --git a/stable/prometheus-operator/README.md b/stable/prometheus-operator/README.md index 0428fbf4f2..974e2d7860 100644 --- a/stable/prometheus-operator/README.md +++ b/stable/prometheus-operator/README.md @@ -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. | `` | diff --git a/stable/prometheus-operator/templates/prometheus/serviceaccount.yaml b/stable/prometheus-operator/templates/prometheus/serviceaccount.yaml index ac4faba445..b4e670e8f8 100644 --- a/stable/prometheus-operator/templates/prometheus/serviceaccount.yaml +++ b/stable/prometheus-operator/templates/prometheus/serviceaccount.yaml @@ -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 }}