volker.raschek/prometheus-postgres-exporter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(deployment): adapt projected volume spec

Browse Source
This commit is contained in:
Markus Pesch 2024-11-26 20:35:32 +01:00
parent bf9bd4853f
commit 503c622df5
Signed by: volker.raschek
GPG Key ID: 852BCC170D81A982
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/prometheus-postgres-exporter/_deployment.tpl
View File

@ -53,7 +53,7 @@
{{- define "prometheus-postgres-exporter.deployment.volumeMounts" -}} {{- define "prometheus-postgres-exporter.deployment.volumeMounts" -}}
{{- $volumeMounts := dict "volumeMounts" (.Values.deployment.postgresExporter.volumeMounts | default (list) ) }} {{- $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" ))) }} {{- $volumeMounts = merge $volumeMounts (dict "volumeMounts" (list (dict "name" "config-d" "mountPath" "/etc/prometheus-postgres-exporter/config.d" ))) }}
{{ toYaml $volumeMounts }} {{ toYaml $volumeMounts }}
{{- end -}} {{- end -}}
@ -72,7 +72,7 @@
{{- $webConfigSecretName = printf "%s-web-config" (include "prometheus-postgres-exporter.fullname" . ) }} {{- $webConfigSecretName = printf "%s-web-config" (include "prometheus-postgres-exporter.fullname" . ) }}
{{- end }} {{- end }}
{{- $volumes = merge $volumes (dict "volumes" (list (dict "name" "config.d" "projected" (dict "defaultMode" "0444" "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 $volumes }} {{ toYaml $volumes }}

18
unittests/deployment/deployment.yaml
View File

@ -42,13 +42,13 @@ tests:
path: spec.template.spec.containers[0].volumeMounts path: spec.template.spec.containers[0].volumeMounts
value: value:
- mountPath: /etc/prometheus-postgres-exporter/config.d - mountPath: /etc/prometheus-postgres-exporter/config.d
name: config.d name: config-d
- equal: - equal:
path: spec.template.spec.volumes path: spec.template.spec.volumes
value: value:
- name: config.d - name: config-d
projected: projected:
defaultMode: "0444" defaultMode: 444
sources: sources:
- secret: - secret:
name: prometheus-postgres-exporter-unittest-exporter-config name: prometheus-postgres-exporter-unittest-exporter-config
@ -143,13 +143,13 @@ tests:
path: spec.template.spec.containers[0].volumeMounts path: spec.template.spec.containers[0].volumeMounts
value: value:
- mountPath: /etc/prometheus-postgres-exporter/config.d - mountPath: /etc/prometheus-postgres-exporter/config.d
name: config.d name: config-d
- equal: - equal:
path: spec.template.spec.volumes path: spec.template.spec.volumes
value: value:
- name: config.d - name: config-d
projected: projected:
defaultMode: "0444" defaultMode: 444
sources: sources:
- secret: - secret:
name: exporter-config-secret name: exporter-config-secret
@ -165,13 +165,13 @@ tests:
path: spec.template.spec.containers[0].volumeMounts path: spec.template.spec.containers[0].volumeMounts
value: value:
- mountPath: /etc/prometheus-postgres-exporter/config.d - mountPath: /etc/prometheus-postgres-exporter/config.d
name: config.d name: config-d
- equal: - equal:
path: spec.template.spec.volumes path: spec.template.spec.volumes
value: value:
- name: config.d - name: config-d
projected: projected:
defaultMode: "0444" defaultMode: 444
sources: sources:
- secret: - secret:
name: prometheus-postgres-exporter-unittest-exporter-config name: prometheus-postgres-exporter-unittest-exporter-config