[helm/alertmanager] Reference external secret for Alertmanager config (#1570)

* Reference external secret for alertmanager config

* Bump versions

* Update README

* Improve wording on README

helm/alertmanager/Chart.yaml

@@ -8,7 +8,7 @@ name: alertmanager
 sources:
   - https://github.com/coreos/prometheus-operator
   - https://github.com/prometheus/alertmanager
-version: 0.1.4
+version: 0.1.5
 appVersion: "0.14.0"
 home: https://github.com/prometheus/alertmanager 
 keywords:

helm/alertmanager/README.md

@@ -44,6 +44,7 @@ The following tables lists the configurable parameters of the alertmanager chart
 Parameter | Description | Default
 --- | --- | ---
 `config` | Alertmanager configuration directives | `{}`
+`configFromSecret` | Alertmanager configuration directives read from external Secret reference by name | `""`
 `externalUrl` | External URL at which Alertmanager will be reachable | `""`
 `routePrefix` | Prefix used to register routes | `"/"`
 `image.repository` | Image | `quay.io/prometheus/alertmanager`

helm/alertmanager/templates/secret.yaml

@@ -1,3 +1,4 @@
+{{- if not .Values.configFromSecret }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -13,3 +14,4 @@ data:
 {{- range $key, $val := .Values.templateFiles }}
   {{ $key }}: {{ $val | b64enc | quote }}
 {{- end }}
+{{- end }}

helm/alertmanager/values.yaml

@@ -37,6 +37,13 @@ templateFiles: {}
 #           {{ range .Labels.SortedPairs }} • *{{ .Name }}:* `{{ .Value }}`
 #           {{ end }}
 
+## The name of a secret in the same kubernetes namespace which contains the Alertmanager config
+## If defined this will be used instead of the `config` block values.
+## The name of the secret must be alertmanager-{{ .Release.Name }} and its data must contain, at least, a key called `alertmanager.yaml`
+## that contains the configuration as value.
+##
+configFromSecret: ""
+
 ## External URL at which Alertmanager will be reachable
 ##
 externalUrl: ""

helm/kube-prometheus/Chart.yaml

@@ -7,4 +7,4 @@ maintainers:
 name: kube-prometheus
 sources:
   - https://github.com/coreos/prometheus-operator
-version: 0.0.102
+version: 0.0.103

helm/kube-prometheus/requirements.yaml

@@ -1,6 +1,6 @@
 dependencies:
   - name: alertmanager
-    version: 0.1.4
+    version: 0.1.5
     #e2e-repository: file://../alertmanager
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
     condition: deployAlertManager