Merge "Fluentd: Fix whitespace chomps for volumes and volume mounts"
This commit is contained in:
commit
fd0952df1a
@ -186,7 +186,7 @@ spec:
|
|||||||
mountPath: /tmp/fluentd.sh
|
mountPath: /tmp/fluentd.sh
|
||||||
subPath: fluentd.sh
|
subPath: fluentd.sh
|
||||||
readOnly: true
|
readOnly: true
|
||||||
{{- if $mounts_fluentd.volumeMounts }}{{ toYaml $mounts_fluentd.volumeMounts | indent 12 }}{{- end }}
|
{{ if $mounts_fluentd.volumeMounts }}{{ toYaml $mounts_fluentd.volumeMounts | indent 12 }}{{- end }}
|
||||||
volumes:
|
volumes:
|
||||||
- name: pod-tmp
|
- name: pod-tmp
|
||||||
emptyDir: {}
|
emptyDir: {}
|
||||||
@ -208,5 +208,5 @@ spec:
|
|||||||
configMap:
|
configMap:
|
||||||
name: {{ printf "%s-%s" $envAll.Release.Name "fluentd-bin" | quote }}
|
name: {{ printf "%s-%s" $envAll.Release.Name "fluentd-bin" | quote }}
|
||||||
defaultMode: 0555
|
defaultMode: 0555
|
||||||
{{- if $mounts_fluentd.volumes }}{{ toYaml $mounts_fluentd.volumes | indent 8 }}{{- end }}
|
{{ if $mounts_fluentd.volumes }}{{ toYaml $mounts_fluentd.volumes | indent 8 }}{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
Loading…
Reference in New Issue
Block a user