keystone: allow custom annotations on jobs

Depends-On: I5d60fe849e172c19d865b614c3c44ea618f92f20
Change-Id: I2b2b9bcf6d7dd6e7513bd76ca6714acc77eb86d1
Signed-off-by: Doug Goldstein <doug.goldstein@rackspace.com>

keystone/Chart.yaml

@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Keystone
 name: keystone
-version: 0.3.9
+version: 0.3.10
 home: https://docs.openstack.org/keystone/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Keystone/OpenStack_Project_Keystone_vertical.png
 sources:

keystone/templates/job-credential-cleanup.yaml

@@ -33,6 +33,7 @@ metadata:
   annotations:
     "helm.sh/hook": pre-delete
     "helm.sh/hook-delete-policy": hook-succeeded, hook-failed
+{{ tuple "keystone_credential_cleanup" $envAll | include "helm-toolkit.snippets.custom_job_annotations" | indent 4 }}
 spec:
   template:
     metadata:

keystone/templates/job-credential-setup.yaml

@@ -62,6 +62,7 @@ metadata:
     "helm.sh/hook-delete-policy": before-hook-creation
 {{- end }}
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
+{{ tuple "keystone_credential_setup" $envAll | include "helm-toolkit.snippets.custom_job_annotations" | indent 4 }}
 spec:
   template:
     metadata:

keystone/templates/job-domain-manage.yaml

@@ -30,6 +30,7 @@ metadata:
   annotations:
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-delete-policy": before-hook-creation
+{{ tuple $serviceAccountName $envAll | include "helm-toolkit.snippets.custom_job_annotations" | indent 4 }}
 spec:
   template:
     metadata:

keystone/templates/job-fernet-setup.yaml

@@ -62,6 +62,7 @@ metadata:
     "helm.sh/hook-weight": "-5"
     "helm.sh/hook-delete-policy": before-hook-creation
 {{- end }}
+{{ tuple "keystone_fernet_setup" $envAll | include "helm-toolkit.snippets.custom_job_annotations" | indent 4 }}
 spec:
   template:
     metadata:

keystone/values_overrides/annotations.yaml

@@ -6,4 +6,10 @@ annotations:
       custom.tld/key2: "value2"
     keystone_api:
       another.tld/foo: "bar"
+  job:
+    default:
+      custom.tld/key: "value"
+      custom.tld/key2: "value2"
+    keystone_credential_setup:
+      another.tld/foo: "bar"
 ...

releasenotes/notes/keystone.yaml

@@ -56,4 +56,5 @@ keystone:
   - 0.3.7 Make keystone TLS configuration granular
   - 0.3.8 Enable custom annotations for Openstack pods
   - 0.3.9 Add 2024.1 overrides
+  - 0.3.10 Allow custom annotations on jobs
 ...