Allow to configure Prometheus annotations (#17897)

Signed-off-by: Mickaël Canévet <mickael.canevet@camptocamp.com>
This commit is contained in:
Mickaël Canévet
2019-10-11 08:43:42 -07:00
committed by Kubernetes Prow Robot
parent 7798fb5f9b
commit ad46bab225
4 changed files with 10 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.16.2
version: 6.17.0
appVersion: 0.32.0
home: https://github.com/coreos/prometheus-operator
keywords:
+1
View File
@@ -217,6 +217,7 @@ The following tables list the configurable parameters of the prometheus-operator
| ----- | ----------- | ------ |
| `prometheus.additionalServiceMonitors` | List of `ServiceMonitor` objects to create. See https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#servicemonitorspec | `[]` |
| `prometheus.enabled` | Deploy prometheus | `true` |
| `prometheus.annotations` | Prometheus annotations | `{}` |
| `prometheus.ingress.annotations` | Prometheus Ingress annotations | `{}` |
| `prometheus.ingress.enabled` | If true, Prometheus Ingress will be created | `false` |
| `prometheus.ingress.hosts` | Prometheus Ingress hostnames | `[]` |
@@ -7,6 +7,10 @@ metadata:
labels:
app: {{ template "prometheus-operator.name" . }}-prometheus
{{ include "prometheus-operator.labels" . | indent 4 }}
{{- if .Values.prometheus.annotations }}
annotations:
{{ toYaml .Values.prometheus.annotations | indent 4 }}
{{- end }}
spec:
alerting:
alertmanagers:
+4
View File
@@ -1153,6 +1153,10 @@ prometheus:
enabled: true
## Annotations for Prometheus
##
annotations: {}
## Service account for Prometheuses to use.
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
##