Skip to content

Commit 61bdce7

Browse files
committed
fix(helm): merge extraAnnotations with init job annotations
1 parent f44d5a4 commit 61bdce7

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

helm/defectdojo/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
appVersion: "2.53.0-dev"
33
description: A Helm chart for Kubernetes to install DefectDojo
44
name: defectdojo
5-
version: 1.8.2-dev
5+
version: 1.9.0-dev
66
icon: https://defectdojo.com/hubfs/DefectDojo_favicon.png
77
maintainers:
88
- name: madchap

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)