Skip to content

Commit 9bba24a

Browse files
authored
reorder merge for proper preference
1 parent d6224c8 commit 9bba24a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

templates/cronjob.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ spec:
3131
labels:
3232
release: {{ .Release.Name }}
3333
{{- if or .Values.podLabels .Values.garbageCollect.podLabels }}
34-
{{- toYaml (merge (.Values.podLabels | default (dict)) (.Values.garbageCollect.podLabels | default (dict))) | nindent 12 }}
34+
{{- toYaml (merge (.Values.garbageCollect.podLabels | default (dict)) (.Values.podLabels | default (dict))) | nindent 12 }}
3535
{{- end }}
3636
{{- if or .Values.podAnnotations .Values.garbageCollect.podAnnotations }}
3737
annotations:
38-
{{- toYaml (merge (.Values.podAnnotations | default (dict)) (.Values.garbageCollect.podAnnotations | default (dict))) | nindent 12 }}
38+
{{- toYaml (merge (.Values.garbageCollect.podAnnotations | default (dict)) (.Values.podAnnotations | default (dict))) | nindent 12 }}
3939
{{- end}}
4040
spec:
4141
{{- if or (eq .Values.serviceAccount.create true) (ne .Values.serviceAccount.name "") }}

0 commit comments

Comments
 (0)