Merge "feat(cinder): add support for custom_job_annotations on selected jobs"

cinder/templates/job-clean.yaml

@@ -55,6 +55,7 @@ metadata:
     "helm.sh/hook": pre-delete
     "helm.sh/hook-delete-policy": hook-succeeded
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
+    {{- tuple "cinder-clean" $envAll | include "helm-toolkit.snippets.custom_job_annotations" | nindent 4 }}
 spec:
   template:
     metadata:

cinder/templates/job-create-internal-tenant.yaml

@@ -28,11 +28,12 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ printf "%s-%s" $serviceUserPretty "create-internal-tenant" | quote }}
-{{- if .Values.helm3_hook }}
   annotations:
+{{- if .Values.helm3_hook }}
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-delete-policy": before-hook-creation
 {{- end }}
+    {{- tuple "cinder-create-internal-tenant" $envAll | include "helm-toolkit.snippets.custom_job_annotations" | nindent 4 }}
   labels:
 {{ tuple $envAll "cinder" "create-internal-tenant" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:

releasenotes/notes/cinder-48232b427a294d57.yaml

@@ -0,0 +1,7 @@
+---
+cinder:
+  - |
+    Enable passing custom_job_annotations via values for specific Cinder jobs.
+    This allows controlling Argo CD / Helm job behavior (e.g., sync-waves,
+    hook policies) without modifying the chart templates directly.
+...