Merge branch 'main' into fix/prometheus-cluster-role

prometheus-community · Sep 29, 2023 · 7bcf1ce · 7bcf1ce
2 parents ab2b998 + 10e87db
commit 7bcf1ce
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/charts/prometheus-adapter/Chart.yaml b/charts/prometheus-adapter/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: prometheus-adapter
-version: 4.5.0
+version: 4.6.0
 appVersion: v0.11.1
 description: A Helm chart for k8s prometheus adapter
 home: https://github.com/kubernetes-sigs/prometheus-adapter

diff --git a/charts/prometheus-adapter/templates/deployment.yaml b/charts/prometheus-adapter/templates/deployment.yaml
@@ -104,6 +104,9 @@ spec:
           name: volume-serving-cert
           readOnly: true
         {{- end }}
+      {{- with .Values.extraContainers }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
       nodeSelector:
         {{- toYaml .Values.nodeSelector | nindent 8 }}
       affinity:

diff --git a/charts/prometheus-adapter/values.yaml b/charts/prometheus-adapter/values.yaml
@@ -213,6 +213,9 @@ extraArguments: []
   # - --tls-private-key-file=/etc/tls/tls.key
   # - --tls-cert-file=/etc/tls/tls.crt
 
+# Additional containers to add to the pod
+extraContainers: []
+
 # Any extra volumes
 extraVolumes: []
   # - name: example-name