diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index f3f8e3af81..c2c5bcf2c0 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -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: diff --git a/stable/prometheus-operator/README.md b/stable/prometheus-operator/README.md index abf19717bd..2abe3d57d4 100644 --- a/stable/prometheus-operator/README.md +++ b/stable/prometheus-operator/README.md @@ -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 | `[]` | diff --git a/stable/prometheus-operator/ci/test-values.yaml b/stable/prometheus-operator/ci/test-values.yaml index 89a0c16014..50be0387a3 100644 --- a/stable/prometheus-operator/ci/test-values.yaml +++ b/stable/prometheus-operator/ci/test-values.yaml @@ -170,6 +170,11 @@ alertmanager: # hosts: # - alertmanager.example.com + ## Configuration for Alertmanager secret + ## + secret: + annotations: {} + ## Configuration for Alertmanager service ## service: diff --git a/stable/prometheus-operator/templates/alertmanager/secret.yaml b/stable/prometheus-operator/templates/alertmanager/secret.yaml index f7563772d9..f12e77f906 100644 --- a/stable/prometheus-operator/templates/alertmanager/secret.yaml +++ b/stable/prometheus-operator/templates/alertmanager/secret.yaml @@ -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 }} diff --git a/stable/prometheus-operator/values.yaml b/stable/prometheus-operator/values.yaml index 13aa0561bf..0f450727b5 100644 --- a/stable/prometheus-operator/values.yaml +++ b/stable/prometheus-operator/values.yaml @@ -170,6 +170,11 @@ alertmanager: # hosts: # - alertmanager.example.com + ## Configuration for Alertmanager secret + ## + secret: + annotations: {} + ## Configuration for Alertmanager service ## service: