Merge pull request #1592 from grnhse/allow-setting-prometheus-pod-annotations

Add ability to specify pod metadata

helm/kube-prometheus/Chart.yaml

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

helm/prometheus/templates/prometheus.yaml

@@ -16,11 +16,22 @@ metadata:
 {{- end }}
   name: {{ template "prometheus.fullname" . }}
 spec:
-{{- if .Values.labels }}
+{{- if or .Values.podMetadata.annotations .Values.podMetadata.labels .Values.labels }}
   podMetadata:
+{{- if .Values.podMetadata.annotations }}
+    annotations:
+{{ toYaml .Values.podMetadata.annotations | indent 6 }}
+{{- end }}
+{{- if or .Values.podMetadata.labels .Values.labels }}
     labels:
+{{- if .Values.labels }}
 {{ toYaml .Values.labels | indent 6 }}
 {{- end }}
+{{- if .Values.podMetadata.labels }}
+{{ toYaml .Values.podMetadata.labels | indent 6 }}
+{{- end }}
+{{- end }}
+{{- end }}
 {{- if .Values.alertingEndpoints }}
   alerting:
     alertmanagers:

helm/prometheus/values.yaml

@@ -128,6 +128,15 @@ logLevel: info
 ## The value "" will disable pod anti-affinity so that no anti-affinity rules will be configured.
 podAntiAffinity: "soft"
 
+podMetadata:
+  ## Annotations to be added to Prometheus pods
+  ##
+  annotations: {}
+
+  ## Labels to be added to Prometheus pods
+  ##
+  labels: {}
+
 ## The remote_read spec configuration for Prometheus.
 ## Ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#remotereadspec
 remoteRead: {}