templates/prometheus-postgres-exporter/_deployment.tpl

@@ -52,15 +52,15 @@
 {{/* volumeMounts */}}
 
 {{- define "prometheus-postgres-exporter.deployment.volumeMounts" -}}
-{{- $volumeMounts := .Values.deployment.postgresExporter.volumeMounts | default list  }}
-{{- $volumeMounts = concat $volumeMounts (list (dict "name" "config-d" "mountPath" "/etc/prometheus-postgres-exporter/config.d" )) }}
-{{ toYaml (dict "volumeMounts" $volumeMounts) }}
+{{- $volumeMounts := dict "volumeMounts" (.Values.deployment.postgresExporter.volumeMounts | default (list) ) }}
+{{- $volumeMounts = merge $volumeMounts (dict "volumeMounts" (list (dict "name" "config-d" "mountPath" "/etc/prometheus-postgres-exporter/config.d" ))) }}
+{{ toYaml $volumeMounts }}
 {{- end -}}
 
 {{/* volumes */}}
 
 {{- define "prometheus-postgres-exporter.deployment.volumes" -}}
-{{- $volumes := .Values.deployment.volumes | default list }}
+{{- $volumes := dict "volumes" (.Values.deployment.volumes | default (list) ) }}
 
 {{- $exporterSecretName := .Values.config.exporterConfig.existingSecret.secretName -}}
 {{- if not .Values.config.exporterConfig.existingSecret.enabled }}
@@ -72,8 +72,8 @@
 {{- $webConfigSecretName = printf "%s-web-config" (include "prometheus-postgres-exporter.fullname" . ) }}
 {{- end }}
 
-{{- $volumes = concat $volumes (list (dict "name" "config-d" "projected" (dict "defaultMode" 444 "sources" (list (dict "secret" (dict "name" $exporterSecretName)) (dict "secret" (dict "name" $webConfigSecretName)))))) }}
+{{- $volumes = merge $volumes (dict "volumes" (list (dict "name" "config-d" "projected" (dict "defaultMode" 444 "sources" (list (dict "secret" (dict "name" $exporterSecretName)) (dict "secret" (dict "name" $webConfigSecretName))))))) }}
 
-{{ toYaml (dict "volumes" $volumes) }}
+{{ toYaml $volumes }}
 
 {{- end -}}

unittests/deployment/deployment.yaml

@@ -352,24 +352,14 @@ tests:
       hostPath:
         path: /usr/lib/prometheus-postgres-exporter/data
   asserts:
-  - equal:
+  - contains:
       path: spec.template.spec.containers[0].volumeMounts
-      value:
-      - name: data
+      content:
+        name: data
         mountPath: /usr/lib/prometheus-postgres-exporter/data
-      - name: config-d
-        mountPath: /etc/prometheus-postgres-exporter/config.d
-  - equal:
+  - contains:
       path: spec.template.spec.volumes
-      value:
-      - name: data
+      content:
+        name: data
         hostPath:
-          path: /usr/lib/prometheus-postgres-exporter/data
-      - name: config-d
-        projected:
-          defaultMode: 444
-          sources:
-          - secret:
-              name: prometheus-postgres-exporter-unittest-exporter-config
-          - secret:
-              name: prometheus-postgres-exporter-unittest-web-config
+          path: /usr/lib/prometheus-postgres-exporter/data