From 47c786e321c89a96c7fef00f14100b35364d9817 Mon Sep 17 00:00:00 2001 From: Omer Levi Hevroni Date: Thu, 2 Jul 2020 11:43:56 +0300 Subject: [PATCH] prometheus-operator/added volumeMounts and volume Signed-off-by: omerlh --- stable/prometheus-operator/Chart.yaml | 2 +- stable/prometheus-operator/README.md | 2 ++ .../templates/alertmanager/alertmanager.yaml | 7 +++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index da8f1d526140..115c44691e2f 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -12,7 +12,7 @@ sources: - https://github.com/coreos/kube-prometheus - https://github.com/coreos/prometheus-operator - https://coreos.com/operators/prometheus -version: 8.15.7 +version: 8.16.0 appVersion: 0.38.1 tillerVersion: ">=2.12.0" home: https://github.com/coreos/prometheus-operator diff --git a/stable/prometheus-operator/README.md b/stable/prometheus-operator/README.md index cb6cb10042b4..4a9eb4c5849a 100644 --- a/stable/prometheus-operator/README.md +++ b/stable/prometheus-operator/README.md @@ -393,6 +393,8 @@ The following tables list the configurable parameters of the prometheus-operator | `alertmanager.alertmanagerSpec.storage` | Storage is the definition of how storage will be used by the Alertmanager instances. | `{}` | | `alertmanager.alertmanagerSpec.tolerations` | If specified, the pod's tolerations. | `[]` | | `alertmanager.alertmanagerSpec.useExistingSecret` | Use an existing secret for configuration (all defined config from values.yaml will be ignored) | `false` | +| `alertmanager.alertmanagerSpec.volumes` | Volumes allows configuration of additional volumes on the output StatefulSet definition. Volumes specified will be appended to other volumes that are generated as a result of StorageSpec objects. | | +| `alertmanager.alertmanagerSpec.volumeMounts` | VolumeMounts allows configuration of additional VolumeMounts on the output StatefulSet definition. VolumeMounts specified will be appended to other VolumeMounts in the alertmanager container, that are generated as a result of StorageSpec objects. | | | `alertmanager.apiVersion` | Api that prometheus will use to communicate with alertmanager. Possible values are v1, v2 | `v2` | | `alertmanager.config` | Provide YAML to configure Alertmanager. See https://prometheus.io/docs/alerting/configuration/#configuration-file. The default provided works to suppress the Watchdog alert from `defaultRules.create` | `{"global":{"resolve_timeout":"5m"},"route":{"group_by":["job"],"group_wait":"30s","group_interval":"5m","repeat_interval":"12h","receiver":"null","routes":[{"match":{"alertname":"Watchdog"},"receiver":"null"}]},"receivers":[{"name":"null"}]}` | | `alertmanager.enabled` | Deploy alertmanager | `true` | diff --git a/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml b/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml index d82b297f68d1..42a3a1c0761f 100644 --- a/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml +++ b/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml @@ -102,6 +102,13 @@ spec: {{- end }} {{- if .Values.alertmanager.alertmanagerSpec.additionalPeers }} additionalPeers: {{.Values.alertmanager.alertmanagerSpec.additionalPeers }} +{{- end }} +{{- if .Values.alertmanager.alertmanagerSpec.volumes }} + volumes: {{.Values.alertmanager.alertmanagerSpec.volumes }} +{{- end }} +{{- if .Values.alertmanager.alertmanagerSpec.volumeMounts }} + volumeMounts: {{.Values.alertmanager.alertmanagerSpec.volumeMounts }} {{- end }} portName: {{ .Values.alertmanager.alertmanagerSpec.portName }} {{- end }} +