Skip to content

Commit c51686e

Browse files
committed
fix(helm): merge extraAnnotations with init job annotations
1 parent b9836f2 commit c51686e

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

helm/defectdojo/templates/initializer-job.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@ spec:
3636
{{- with .Values.initializer.labels }}
3737
{{- toYaml . | nindent 8 }}
3838
{{- end }}
39+
{{- with mergeOverwrite dict .Values.extraAnnotations .Values.initializer.podAnnotations }}
3940
annotations:
40-
{{- with .Values.initializer.annotations }}
41-
{{- toYaml . | nindent 8 }}
41+
{{- range $key, $value := . }}
42+
{{ $key }}: {{ quote $value }}
43+
{{- end }}
4244
{{- end }}
4345
spec:
4446
{{- if .Values.securityContext.enabled }}

helm/defectdojo/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ initializer:
486486
run: true
487487
automountServiceAccountToken: false
488488
jobAnnotations: {}
489-
annotations: {}
489+
podAnnotations: {}
490490
labels: {}
491491
# -- A positive integer will keep this Job and Pod deployed for the specified number of seconds, after which they will be removed. For all other values, the Job and Pod will remain deployed.
492492
keepSeconds: 60

0 commit comments

Comments
 (0)