[stable/prometheus-operator] Add annotate AlertManager Secret (#17610)

Signed-off-by: IainBowman <iain.bowman@gmail.com>
This commit is contained in:
Iain Bowman
2019-10-07 10:01:15 -07:00
committed by Kubernetes Prow Robot
parent c6ff67e215
commit e31fa8672b
5 changed files with 16 additions and 1 deletions
+1 -1
View File
@@ -10,7 +10,7 @@ name: prometheus-operator
sources:
- https://github.com/coreos/prometheus-operator
- https://coreos.com/operators/prometheus
version: 6.12.1
version: 6.13.0
appVersion: 0.32.0
home: https://github.com/coreos/prometheus-operator
keywords:
+1
View File
@@ -336,6 +336,7 @@ The following tables list the configurable parameters of the prometheus-operator
| `alertmanager.podDisruptionBudget.enabled` | If true, create a pod disruption budget for Alertmanager pods. The created resource cannot be modified once created - it must be deleted to perform a change | `false` |
| `alertmanager.podDisruptionBudget.maxUnavailable` | Maximum number / percentage of pods that may be made unavailable | `""` |
| `alertmanager.podDisruptionBudget.minAvailable` | Minimum number / percentage of pods that should remain scheduled | `1` |
| `alertmanager.secret.annotations` | Alertmanager Secret annotations | `{}` |
| `alertmanager.service.annotations` | Alertmanager Service annotations | `{}` |
| `alertmanager.service.clusterIP` | Alertmanager service clusterIP IP | `""` |
| `alertmanager.service.externalIPs` | List of IP addresses at which the Alertmanager server service is available | `[]` |
@@ -170,6 +170,11 @@ alertmanager:
# hosts:
# - alertmanager.example.com
## Configuration for Alertmanager secret
##
secret:
annotations: {}
## Configuration for Alertmanager service
##
service:
@@ -3,6 +3,10 @@ apiVersion: v1
kind: Secret
metadata:
name: alertmanager-{{ template "prometheus-operator.fullname" . }}-alertmanager
{{- if .Values.alertmanager.secret.annotations }}
annotations:
{{ toYaml .Values.alertmanager.secret.annotations | indent 4 }}
{{- end }}
labels:
app: {{ template "prometheus-operator.name" . }}-alertmanager
{{ include "prometheus-operator.labels" . | indent 4 }}
+5
View File
@@ -170,6 +170,11 @@ alertmanager:
# hosts:
# - alertmanager.example.com
## Configuration for Alertmanager secret
##
secret:
annotations: {}
## Configuration for Alertmanager service
##
service: