fix: mounting of env var file
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Markus Pesch 2022-05-24 22:43:23 +02:00
parent 1c94c9de06
commit ea2ca22e7c
Signed by: volker.raschek
GPG Key ID: 852BCC170D81A982
3 changed files with 7 additions and 7 deletions

View File

@ -5,7 +5,7 @@ metadata:
labels: labels:
{{- include "droneRunner.labels" . | nindent 4 }} {{- include "droneRunner.labels" . | nindent 4 }}
spec: spec:
replicas: {{ .Values.replicaCount | default 1 | quote }} replicas: {{ .Values.replicaCount | default 1 }}
selector: selector:
matchLabels: matchLabels:
{{- include "droneRunner.selectorLabels" . | nindent 6 }} {{- include "droneRunner.selectorLabels" . | nindent 6 }}
@ -38,7 +38,7 @@ spec:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}
{{- if and (hasKey .Values.envFile "content") (hasKey .Values.config "DRONE_RUNNER_ENV_FILE") }} {{- if and (hasKey .Values.envFile "content") (hasKey .Values.config "DRONE_RUNNER_ENV_FILE") }}
volumeMounts: volumeMounts:
- name: env-file - name: custom-env-vars
mountPath: {{ dir .Values.config.DRONE_RUNNER_ENV_FILE }} mountPath: {{ dir .Values.config.DRONE_RUNNER_ENV_FILE }}
readOnly: true readOnly: true
{{- end}} {{- end}}
@ -60,10 +60,10 @@ spec:
{{- end }} {{- end }}
{{- if and (hasKey .Values.envFile "content") (hasKey .Values.config "DRONE_RUNNER_ENV_FILE") }} {{- if and (hasKey .Values.envFile "content") (hasKey .Values.config "DRONE_RUNNER_ENV_FILE") }}
volumes: volumes:
- name: env-file - name: custom-env-vars
configMap: configMap:
name: {{ include "droneRunner.fullname" . }} name: {{ include "droneRunner.fullname" . }}
items: items:
- key: {{ base .Values.config.DRONE_RUNNER_ENV_FILE }} - key: custom-env-vars
path: {{ base .Values.config.DRONE_RUNNER_ENV_FILE }} path: {{ base .Values.config.DRONE_RUNNER_ENV_FILE }}
{{- end}} {{- end}}

View File

@ -6,6 +6,6 @@ metadata:
{{- include "droneRunner.labels" . | nindent 4 }} {{- include "droneRunner.labels" . | nindent 4 }}
name: {{ include "droneRunner.fullname" . }} name: {{ include "droneRunner.fullname" . }}
data: data:
{{ base .Values.config.DRONE_RUNNER_ENV_FILE }}: | custom-env-vars: |
{{ .Values.envFile.content }} {{- .Values.envFile.content | nindent 4 }}
{{- end }} {{- end }}

View File

@ -337,7 +337,7 @@ config: {}
# DRONE_UI_USERNAME: "" # DRONE_UI_USERNAME: ""
envFile: {} envFile: {}
# content: | # content: |-
# KEY=VALUE # KEY=VALUE