Compare commits
2 Commits
bf9bd4853f
...
dcc7bae921
Author | SHA1 | Date | |
---|---|---|---|
dcc7bae921 | |||
503c622df5 |
@ -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 }}
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ metadata:
|
|||||||
labels:
|
labels:
|
||||||
{{- toYaml . | nindent 4 }}
|
{{- toYaml . | nindent 4 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
name: {{ include "prometheus-postgres-exporter.fullname" . }}-webconfig
|
name: {{ include "prometheus-postgres-exporter.fullname" . }}-web-config
|
||||||
namespace: {{ .Release.Namespace }}
|
namespace: {{ .Release.Namespace }}
|
||||||
stringData:
|
stringData:
|
||||||
webConfig.yaml: |
|
webConfig.yaml: |
|
||||||
|
@ -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
|
||||||
|
@ -15,7 +15,7 @@ tests:
|
|||||||
- containsDocument:
|
- containsDocument:
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Secret
|
kind: Secret
|
||||||
name: prometheus-postgres-exporter-unittest-webconfig
|
name: prometheus-postgres-exporter-unittest-web-config
|
||||||
namespace: testing
|
namespace: testing
|
||||||
- notExists:
|
- notExists:
|
||||||
path: metadata.annotations
|
path: metadata.annotations
|
||||||
|
Loading…
Reference in New Issue
Block a user