github/docker-registry.helm
1
0
Fork 0
mirror of https://github.com/twuni/docker-registry.helm.git synced 2026-02-14 12:49:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

reorder merge for proper preference

Browse Source
This commit is contained in:
Mercbot7
2025-04-15 09:09:43 -04:00
committed by GitHub
parent d6224c847b
commit 9bba24a3d2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/cronjob.yaml
View File

@@ -31,11 +31,11 @@ spec:
labels:
release: {{ .Release.Name }}
{{- if or .Values.podLabels .Values.garbageCollect.podLabels }}
{{- toYaml (merge (.Values.podLabels | default (dict)) (.Values.garbageCollect.podLabels | default (dict))) | nindent 12 }}
{{- toYaml (merge (.Values.garbageCollect.podLabels | default (dict)) (.Values.podLabels | default (dict))) | nindent 12 }}
{{- end }}
{{- if or .Values.podAnnotations .Values.garbageCollect.podAnnotations }}
annotations:
{{- toYaml (merge (.Values.podAnnotations | default (dict)) (.Values.garbageCollect.podAnnotations | default (dict))) | nindent 12 }}
{{- toYaml (merge (.Values.garbageCollect.podAnnotations | default (dict)) (.Values.podAnnotations | default (dict))) | nindent 12 }}
{{- end}}
spec:
{{- if or (eq .Values.serviceAccount.create true) (ne .Values.serviceAccount.name "") }}