From deb5aa63c414afa65297b91b7d7db4d079a3004c Mon Sep 17 00:00:00 2001 From: Vasily Sliouniaev Date: Mon, 5 Nov 2018 19:23:46 +0000 Subject: [PATCH] Add rbac condition in alertmanager (#9007) Signed-off-by: Vasily Sliouniaev --- stable/prometheus-operator/Chart.yaml | 2 +- .../templates/alertmanager/alertmanager.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index 88088c310d..a9910eca26 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -9,7 +9,7 @@ name: prometheus-operator sources: - https://github.com/coreos/prometheus-operator - https://coreos.com/operators/prometheus -version: 0.1.12 +version: 0.1.13 appVersion: "0.25.0" home: https://github.com/coreos/prometheus-operator keywords: diff --git a/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml b/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml index 435bc85976..945e5d6d20 100644 --- a/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml +++ b/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml @@ -13,7 +13,9 @@ spec: {{- end }} replicas: {{ .Values.alertmanager.alertmanagerSpec.replicas }} listenLocal: {{ .Values.alertmanager.alertmanagerSpec.listenLocal }} +{{- if .Values.global.rbac.create }} serviceAccountName: {{ template "prometheus-operator.alertmanager.serviceAccountName" . }} +{{- end }} {{- if .Values.alertmanager.alertmanagerSpec.externalUrl }} externalUrl: "{{ .Values.alertmanager.alertmanagerSpec.externalUrl }}" {{- end }}