From 5b4f50707659bc26b096177aeb3e8471876fbe09 Mon Sep 17 00:00:00 2001 From: Tuan Anh Nguyen Date: Tue, 12 May 2020 11:57:31 +0700 Subject: [PATCH] fix default non-ha state for alert-manager statefulset Signed-off-by: Tuan Anh Nguyen --- stable/prometheus/Chart.yaml | 2 +- stable/prometheus/README.md | 2 +- stable/prometheus/templates/alertmanager-statefulset.yaml | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stable/prometheus/Chart.yaml b/stable/prometheus/Chart.yaml index 01406f32bc..e06620bc1d 100644 --- a/stable/prometheus/Chart.yaml +++ b/stable/prometheus/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: prometheus -version: 11.1.6 +version: 11.1.7 appVersion: 2.16.0 description: Prometheus is a monitoring system and time series database. home: https://prometheus.io/ diff --git a/stable/prometheus/README.md b/stable/prometheus/README.md index 8f73047a60..10aa8fd14b 100644 --- a/stable/prometheus/README.md +++ b/stable/prometheus/README.md @@ -165,7 +165,7 @@ Parameter | Description | Default `alertmanager.statefulSet.podManagementPolicy` | podManagementPolicy of alertmanager pods | `OrderedReady` `alertmanager.statefulSet.headless.annotations` | annotations for alertmanager headless service | `{}` `alertmanager.statefulSet.headless.labels` | labels for alertmanager headless service | `{}` -`alertmanager.statefulSet.headless.enableMeshPeer` | If true, enable the mesh peer endpoint for the headless service | `{}` +`alertmanager.statefulSet.headless.enableMeshPeer` | If true, enable the mesh peer endpoint for the headless service | `false` `alertmanager.statefulSet.headless.servicePort` | alertmanager headless service port | `80` `alertmanager.priorityClassName` | alertmanager priorityClassName | `nil` `alertmanager.resources` | alertmanager pod resource requests & limits | `{}` diff --git a/stable/prometheus/templates/alertmanager-statefulset.yaml b/stable/prometheus/templates/alertmanager-statefulset.yaml index 8750e4ddfc..4df3860176 100644 --- a/stable/prometheus/templates/alertmanager-statefulset.yaml +++ b/stable/prometheus/templates/alertmanager-statefulset.yaml @@ -55,6 +55,8 @@ spec: {{- range $n := until (.Values.alertmanager.replicaCount | int) }} - --cluster.peer={{ template "prometheus.alertmanager.fullname" $ }}-{{ $n }}.{{ template "prometheus.alertmanager.fullname" $ }}-headless:6783 {{- end }} + {{- else }} + - --cluster.listen-address="" {{- end }} {{- range $key, $value := .Values.alertmanager.extraArgs }} - --{{ $key }}={{ $value }}