Skip to content

Commit 1e2a7fc

Browse files
authored
Fix merging of security context, previous implementation did override the value and were appliend to the next sidecar(s)
1 parent 3d90d76 commit 1e2a7fc

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

charts/application/templates/_podTemplate.tpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ spec:
127127
{{- end }}
128128
securityContext:
129129
{{- if and $s.securityContext $.Values.sidecarDefaults.securityContext }}
130-
{{- toYaml (mergeOverwrite $.Values.sidecarDefaults.securityContext $s.securityContext) | nindent 8 }}
130+
{{- toYaml (merge $s.securityContext $.Values.sidecarDefaults.securityContext) | nindent 8 }}
131131
{{- else }}
132132
{{- toYaml (or $s.securityContext $.Values.sidecarDefaults.securityContext) | nindent 8 }}
133133
{{- end }}

0 commit comments

Comments
 (0)