[prometheus-elasticsearch-exporter] Deployment volumes volumeMounts fix

charts/prometheus-elasticsearch-exporter/.helmignore

@@ -22,3 +22,5 @@ OWNERS
 .idea/
 *.tmproj
 .vscode/
+
+ci/

charts/prometheus-elasticsearch-exporter/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Elasticsearch stats exporter for Prometheus
 name: prometheus-elasticsearch-exporter
-version: 6.7.1
+version: 6.7.2
 kubeVersion: ">=1.19.0-0"
 appVersion: "v1.9.0"
 home: https://github.com/prometheus-community/elasticsearch_exporter

charts/prometheus-elasticsearch-exporter/ci/common-labels-values.yaml

@@ -0,0 +1,4 @@
+---
+commonLabels:
+  foo: bar
+  baz: qux

charts/prometheus-elasticsearch-exporter/ci/deployment-labels-values.yaml

@@ -0,0 +1,7 @@
+---
+deployment:
+  labels:
+    foo: bar
+    baz: qux
+  annotations:
+    foo.io/bar: baz

charts/prometheus-elasticsearch-exporter/ci/env-values.yaml

@@ -0,0 +1,4 @@
+---
+env:
+  FOO: bar
+  BAZ: qux

charts/prometheus-elasticsearch-exporter/ci/extra-volumes-values.yaml

@@ -0,0 +1,10 @@
+---
+extraVolumes:
+  - name: cache
+    emptyDir:
+      sizeLimit: 100Mi
+
+extraVolumeMounts:
+  - name: cache
+    mountPath: /cache
+    readOnly: false

charts/prometheus-elasticsearch-exporter/ci/pod-labels-values.yaml

@@ -0,0 +1,7 @@
+---
+podLabels:
+  foo: bar
+  baz: qux
+
+podAnnotations:
+  foo.io/bar: baz

charts/prometheus-elasticsearch-exporter/ci/pod-monitor-values.yaml

@@ -0,0 +1,5 @@
+---
+podMonitor:
+  enabled: true
+  labels:
+    foo: bar

charts/prometheus-elasticsearch-exporter/ci/secret-mounts-values.yaml

@@ -0,0 +1,16 @@
+---
+secretMounts:
+  - name: secret
+    path: /etc/secret
+    secretName: mysecret
+
+extraManifests:
+  - |
+    apiVersion: v1
+    kind: Secret
+    metadata:
+      name: mysecret
+      labels: {{ include "elasticsearch-exporter.labels" . | nindent 4 }}
+    type: Opaque
+    data:
+      foo: YmFy

charts/prometheus-elasticsearch-exporter/ci/service-labels-values.yaml

@@ -0,0 +1,7 @@
+---
+service:
+  labels:
+    foo: bar
+    baz: qux
+  annotations:
+    foo.io/bar: baz

charts/prometheus-elasticsearch-exporter/ci/service-monitor-values.yaml

@@ -0,0 +1,6 @@
+---
+serviceMonitor:
+  enabled: true
+  labels:
+    foo: bar
+  jobLabel: app.kubernetes.io/name

charts/prometheus-elasticsearch-exporter/templates/deployment.yaml

@@ -160,6 +160,7 @@ spec:
             preStop:
               exec:
                 command: ["/bin/sleep", "20"]
+          {{- if or (and .Values.es.ssl.enabled (eq .Values.es.ssl.useExistingSecrets false)) (not (empty .Values.secretMounts)) (not (empty .Values.extraVolumeMounts)) }}
           volumeMounts:
             {{- if and .Values.es.ssl.enabled (eq .Values.es.ssl.useExistingSecrets false) }}
             - mountPath: /ssl
@@ -175,6 +176,7 @@ spec:
             {{- with .Values.extraVolumeMounts }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
+          {{- end }}
       {{- with .Values.initContainers }}
       initContainers:
         {{- toYaml . | nindent 8 }}
@@ -195,6 +197,7 @@ spec:
       topologySpreadConstraints:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if or (and .Values.es.ssl.enabled (eq .Values.es.ssl.useExistingSecrets false)) (not (empty .Values.secretMounts)) (not (empty .Values.extraVolumes)) }}
       volumes:
         {{- if and .Values.es.ssl.enabled (eq .Values.es.ssl.useExistingSecrets false) }}
         - name: ssl
@@ -209,3 +212,4 @@ spec:
         {{- with .Values.extraVolumes }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
+      {{- end }}