diff --git a/glance/templates/job-clean.yaml b/glance/templates/job-clean.yaml index 26977c0848..4694acfb77 100644 --- a/glance/templates/job-clean.yaml +++ b/glance/templates/job-clean.yaml @@ -54,6 +54,7 @@ metadata: annotations: "helm.sh/hook": pre-delete "helm.sh/hook-delete-policy": hook-succeeded +{{ tuple $serviceAccountName $envAll | include "helm-toolkit.snippets.custom_job_annotations" | indent 4 -}} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: diff --git a/glance/templates/job-metadefs-load.yaml b/glance/templates/job-metadefs-load.yaml index 1c2efaaae7..dfaeade04f 100644 --- a/glance/templates/job-metadefs-load.yaml +++ b/glance/templates/job-metadefs-load.yaml @@ -28,6 +28,7 @@ metadata: {{- if .Values.helm3_hook }} helm.sh/hook: post-install,post-upgrade {{- end }} +{{ tuple $serviceAccountName $envAll | include "helm-toolkit.snippets.custom_job_annotations" | indent 4 -}} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: diff --git a/glance/templates/job-storage-init.yaml b/glance/templates/job-storage-init.yaml index be9d2331ba..86c09c7eb5 100644 --- a/glance/templates/job-storage-init.yaml +++ b/glance/templates/job-storage-init.yaml @@ -56,6 +56,7 @@ metadata: {{- if .Values.helm3_hook }} helm.sh/hook: post-install,post-upgrade {{- end }} +{{ tuple $serviceAccountName $envAll | include "helm-toolkit.snippets.custom_job_annotations" | indent 4 -}} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: diff --git a/releasenotes/notes/glance-e528d9f2473763a1.yaml b/releasenotes/notes/glance-e528d9f2473763a1.yaml new file mode 100644 index 0000000000..8116986e76 --- /dev/null +++ b/releasenotes/notes/glance-e528d9f2473763a1.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fix missing job annotation support from values.yaml on the clean, metadefs-load, + and storage-init jobs. +...