Add sidecar containers field to Prometheus Helm chart (#1485)

* helm/prometheus: Add prometheus labels to prometheus podMetadata labels

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>

* helm/prometheus: Add sidecarsSpec field

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>

* Update Chart.yaml

helm/kube-prometheus/Chart.yaml

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

helm/kube-prometheus/requirements.yaml

@@ -6,7 +6,7 @@ dependencies:
     condition: deployAlertManager
 
   - name: prometheus
-    version: 0.0.44
+    version: 0.0.45
     #e2e-repository: file://../prometheus
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
 

helm/kube-prometheus/values.yaml

@@ -425,6 +425,10 @@ prometheus:
   #          storage: 50Gi
   #    selector: {}
 
+  sidecarsSpec: []
+  # - name: sidecar
+  #   image: registry/name:tag
+
 # default rules are in templates/general.rules.yaml
 # prometheusRules: {}
 

helm/prometheus/Chart.yaml

@@ -7,4 +7,4 @@ maintainers:
 name: prometheus
 sources:
   - https://github.com/coreos/prometheus-operator
-version: 0.0.44
+version: 0.0.45

helm/prometheus/templates/prometheus.yaml

@@ -16,6 +16,11 @@ metadata:
 {{- end }}
   name: {{ template "prometheus.fullname" . }}
 spec:
+{{- if .Values.labels }}
+  podMetadata:
+    labels:
+{{ toYaml .Values.labels | indent 6 }}
+{{- end }}
 {{- if .Values.alertingEndpoints }}
   alerting:
     alertmanagers:
@@ -129,4 +134,8 @@ spec:
     name: prometheus-{{ .Release.Name }}-additional-alertmanager-configs
     key: additional-alertmanager-configs.yaml
 {{- end }}
+{{- if .Values.sidecarsSpec }}
+  containers:
+{{ toYaml .Values.sidecarsSpec | indent 4 }}
+{{- end }}
 

helm/prometheus/values.yaml

@@ -348,3 +348,7 @@ additionalAlertManagerConfigs: {}
 #   - "localhost:9093"
 
 serviceMonitorNamespaceSelector: {}
+
+sidecarsSpec: []
+# - name: sidecar
+#   image: registry/name:tag