From b1a247e7f54ab12d830ab74f7634457b4e43f3ef Mon Sep 17 00:00:00 2001
From: Sean Eagan <seaneagan1@gmail.com>
Date: Wed, 29 Sep 2021 16:33:44 -0500
Subject: [PATCH] Helm 3 - Fix Job labels

If labels are not specified on a Job, kubernetes defaults them
to include the labels of their underlying Pod template. Helm 3
injects metadata into all resources [0] including a
`app.kubernetes.io/managed-by: Helm` label. Thus when kubernetes
sees a Job's labels they are no longer empty and thus do not get
defaulted to the underlying Pod template's labels. This is a
problem since Job labels are depended on by
- Armada pre-upgrade delete hooks
- Armada wait logic configurations
- kubernetes-entrypoint dependencies

Thus for each Job template this adds labels matching the
underlying Pod template to retain the same labels that were
present with Helm 2.

[0]: https://github.com/helm/helm/pull/7649

Change-Id: I3b6b25fcc6a1af4d56f3e2b335615074e2f04b6d
---
 calico/Chart.yaml                                            | 2 +-
 calico/templates/job-calico-settings.yaml                    | 2 ++
 ceph-client/Chart.yaml                                       | 2 +-
 ceph-client/templates/job-bootstrap.yaml                     | 2 ++
 ceph-client/templates/job-rbd-pool.yaml                      | 2 ++
 ceph-mon/Chart.yaml                                          | 2 +-
 ceph-mon/templates/job-bootstrap.yaml                        | 2 ++
 ceph-mon/templates/job-keyring.yaml                          | 2 ++
 ceph-mon/templates/job-storage-admin-keys.yaml               | 2 ++
 ceph-osd/Chart.yaml                                          | 2 +-
 ceph-osd/templates/job-bootstrap.yaml                        | 2 ++
 ceph-osd/templates/job-post-apply.yaml                       | 2 ++
 ceph-provisioners/Chart.yaml                                 | 2 +-
 ceph-provisioners/templates/job-bootstrap.yaml               | 2 ++
 ceph-provisioners/templates/job-cephfs-client-key.yaml       | 2 ++
 .../templates/job-namespace-client-ceph-config.yaml          | 2 ++
 .../templates/job-namespace-client-key-cleaner.yaml          | 2 ++
 ceph-provisioners/templates/job-namespace-client-key.yaml    | 2 ++
 ceph-rgw/Chart.yaml                                          | 2 +-
 ceph-rgw/templates/job-bootstrap.yaml                        | 2 ++
 ceph-rgw/templates/job-rgw-placement-targets.yaml            | 2 ++
 ceph-rgw/templates/job-rgw-restart.yaml                      | 2 ++
 ceph-rgw/templates/job-rgw-storage-init.yaml                 | 2 ++
 ceph-rgw/templates/job-s3-admin.yaml                         | 2 ++
 elasticsearch/Chart.yaml                                     | 2 +-
 elasticsearch/templates/job-elasticsearch-template.yaml      | 2 ++
 gnocchi/Chart.yaml                                           | 2 +-
 gnocchi/templates/job-clean.yaml                             | 2 ++
 gnocchi/templates/job-db-init-indexer.yaml                   | 2 ++
 gnocchi/templates/job-db-sync.yaml                           | 2 ++
 gnocchi/templates/job-storage-init.yaml                      | 2 ++
 grafana/Chart.yaml                                           | 2 +-
 grafana/templates/job-db-init-session.yaml                   | 2 ++
 grafana/templates/job-db-init.yaml                           | 2 ++
 grafana/templates/job-db-session-sync.yaml                   | 2 ++
 grafana/templates/job-set-admin-user.yaml                    | 2 ++
 helm-toolkit/Chart.yaml                                      | 2 +-
 helm-toolkit/templates/manifests/_job-bootstrap.tpl          | 5 +++++
 helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl      | 5 +++++
 helm-toolkit/templates/manifests/_job-db-init-mysql.tpl      | 5 +++++
 helm-toolkit/templates/manifests/_job-db-sync.tpl            | 5 +++++
 helm-toolkit/templates/manifests/_job-ks-endpoints.tpl       | 5 +++++
 helm-toolkit/templates/manifests/_job-ks-service.tpl         | 5 +++++
 helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl       | 5 +++++
 helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl   | 5 +++++
 helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl     | 5 +++++
 helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl       | 5 +++++
 helm-toolkit/templates/manifests/_job_image_repo_sync.tpl    | 5 +++++
 kibana/Chart.yaml                                            | 2 +-
 kibana/templates/job-flush-kibana-metadata.yaml              | 2 ++
 kibana/templates/job-register-kibana-indexes.yaml            | 2 ++
 mariadb/Chart.yaml                                           | 2 +-
 .../monitoring/prometheus/exporter-job-create-user.yaml      | 2 ++
 postgresql/Chart.yaml                                        | 2 +-
 .../monitoring/prometheus/exporter-job-create-user.yaml      | 2 ++
 powerdns/Chart.yaml                                          | 2 +-
 powerdns/templates/job-db-sync.yaml                          | 2 ++
 prometheus-openstack-exporter/Chart.yaml                     | 2 +-
 prometheus-openstack-exporter/templates/job-ks-user.yaml     | 2 ++
 registry/Chart.yaml                                          | 2 +-
 registry/templates/job-bootstrap.yaml                        | 2 ++
 releasenotes/notes/calico.yaml                               | 1 +
 releasenotes/notes/ceph-client.yaml                          | 1 +
 releasenotes/notes/ceph-mon.yaml                             | 1 +
 releasenotes/notes/ceph-osd.yaml                             | 1 +
 releasenotes/notes/ceph-provisioners.yaml                    | 1 +
 releasenotes/notes/ceph-rgw.yaml                             | 1 +
 releasenotes/notes/elasticsearch.yaml                        | 1 +
 releasenotes/notes/gnocchi.yaml                              | 1 +
 releasenotes/notes/grafana.yaml                              | 1 +
 releasenotes/notes/helm-toolkit.yaml                         | 1 +
 releasenotes/notes/kibana.yaml                               | 1 +
 releasenotes/notes/mariadb.yaml                              | 1 +
 releasenotes/notes/postgresql.yaml                           | 1 +
 releasenotes/notes/powerdns.yaml                             | 1 +
 releasenotes/notes/prometheus-openstack-exporter.yaml        | 1 +
 releasenotes/notes/registry.yaml                             | 1 +
 77 files changed, 155 insertions(+), 16 deletions(-)

diff --git a/calico/Chart.yaml b/calico/Chart.yaml
index 98281c62a..56f44559e 100644
--- a/calico/Chart.yaml
+++ b/calico/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v3.4.0
 description: OpenStack-Helm Calico
 name: calico
-version: 0.1.2
+version: 0.1.3
 home: https://github.com/projectcalico/calico
 icon: https://camo.githubusercontent.com/64c8b5ed6ac97553ae367348e8a59a24e2ed5bdc/687474703a2f2f646f63732e70726f6a65637463616c69636f2e6f72672f696d616765732f66656c69782e706e67
 sources:
diff --git a/calico/templates/job-calico-settings.yaml b/calico/templates/job-calico-settings.yaml
index 2329bbc94..b46fe61bf 100644
--- a/calico/templates/job-calico-settings.yaml
+++ b/calico/templates/job-calico-settings.yaml
@@ -22,6 +22,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: calico-settings
+  labels:
+{{ tuple $envAll "calico" "calico_settings" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/ceph-client/Chart.yaml b/ceph-client/Chart.yaml
index 0d77db331..af4bc4581 100644
--- a/ceph-client/Chart.yaml
+++ b/ceph-client/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph Client
 name: ceph-client
-version: 0.1.22
+version: 0.1.23
 home: https://github.com/ceph/ceph-client
 ...
diff --git a/ceph-client/templates/job-bootstrap.yaml b/ceph-client/templates/job-bootstrap.yaml
index 86191d9f5..760ac202f 100644
--- a/ceph-client/templates/job-bootstrap.yaml
+++ b/ceph-client/templates/job-bootstrap.yaml
@@ -22,6 +22,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: ceph-client-bootstrap
+  labels:
+{{ tuple $envAll "ceph" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/ceph-client/templates/job-rbd-pool.yaml b/ceph-client/templates/job-rbd-pool.yaml
index 7d0fce2f9..1b82adf46 100644
--- a/ceph-client/templates/job-rbd-pool.yaml
+++ b/ceph-client/templates/job-rbd-pool.yaml
@@ -22,6 +22,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: ceph-rbd-pool
+  labels:
+{{ tuple $envAll "ceph" "rbd-pool" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/ceph-mon/Chart.yaml b/ceph-mon/Chart.yaml
index af94548e1..3b57ae4e1 100644
--- a/ceph-mon/Chart.yaml
+++ b/ceph-mon/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph Mon
 name: ceph-mon
-version: 0.1.12
+version: 0.1.13
 home: https://github.com/ceph/ceph
 ...
diff --git a/ceph-mon/templates/job-bootstrap.yaml b/ceph-mon/templates/job-bootstrap.yaml
index 15a90569e..d45d63de7 100644
--- a/ceph-mon/templates/job-bootstrap.yaml
+++ b/ceph-mon/templates/job-bootstrap.yaml
@@ -22,6 +22,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: ceph-bootstrap
+  labels:
+{{ tuple $envAll "ceph" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/ceph-mon/templates/job-keyring.yaml b/ceph-mon/templates/job-keyring.yaml
index 2b17ae94c..645b57754 100644
--- a/ceph-mon/templates/job-keyring.yaml
+++ b/ceph-mon/templates/job-keyring.yaml
@@ -52,6 +52,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ $jobName }}
+  labels:
+{{ tuple $envAll "ceph" $jobName | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/ceph-mon/templates/job-storage-admin-keys.yaml b/ceph-mon/templates/job-storage-admin-keys.yaml
index 77fdcd378..fbbedff1b 100644
--- a/ceph-mon/templates/job-storage-admin-keys.yaml
+++ b/ceph-mon/templates/job-storage-admin-keys.yaml
@@ -49,6 +49,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: ceph-storage-keys-generator
+  labels:
+{{ tuple $envAll "ceph" "storage-keys-generator" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/ceph-osd/Chart.yaml b/ceph-osd/Chart.yaml
index e0fabacd9..e4d766f3d 100644
--- a/ceph-osd/Chart.yaml
+++ b/ceph-osd/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph OSD
 name: ceph-osd
-version: 0.1.30
+version: 0.1.31
 home: https://github.com/ceph/ceph
 ...
diff --git a/ceph-osd/templates/job-bootstrap.yaml b/ceph-osd/templates/job-bootstrap.yaml
index 46592fbee..eb1c01900 100644
--- a/ceph-osd/templates/job-bootstrap.yaml
+++ b/ceph-osd/templates/job-bootstrap.yaml
@@ -22,6 +22,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: ceph-osd-bootstrap
+  labels:
+{{ tuple $envAll "ceph" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/ceph-osd/templates/job-post-apply.yaml b/ceph-osd/templates/job-post-apply.yaml
index d29755b0b..e248def9b 100644
--- a/ceph-osd/templates/job-post-apply.yaml
+++ b/ceph-osd/templates/job-post-apply.yaml
@@ -68,6 +68,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ $serviceAccountName }}
+  labels:
+{{ tuple $envAll "ceph-upgrade" "post-apply" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/ceph-provisioners/Chart.yaml b/ceph-provisioners/Chart.yaml
index a6ec5103b..b26c6a2b2 100644
--- a/ceph-provisioners/Chart.yaml
+++ b/ceph-provisioners/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph Provisioner
 name: ceph-provisioners
-version: 0.1.13
+version: 0.1.14
 home: https://github.com/ceph/ceph
 ...
diff --git a/ceph-provisioners/templates/job-bootstrap.yaml b/ceph-provisioners/templates/job-bootstrap.yaml
index d3971086c..ec7596493 100644
--- a/ceph-provisioners/templates/job-bootstrap.yaml
+++ b/ceph-provisioners/templates/job-bootstrap.yaml
@@ -22,6 +22,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: ceph-client-bootstrap
+  labels:
+{{ tuple $envAll "ceph" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/ceph-provisioners/templates/job-cephfs-client-key.yaml b/ceph-provisioners/templates/job-cephfs-client-key.yaml
index 38b43d376..e529d0659 100644
--- a/ceph-provisioners/templates/job-cephfs-client-key.yaml
+++ b/ceph-provisioners/templates/job-cephfs-client-key.yaml
@@ -80,6 +80,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: ceph-cephfs-client-key-generator
+  labels:
+{{ tuple $envAll "ceph" "cephfs-client-key-generator" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/ceph-provisioners/templates/job-namespace-client-ceph-config.yaml b/ceph-provisioners/templates/job-namespace-client-ceph-config.yaml
index 154df6bfe..187d704e2 100644
--- a/ceph-provisioners/templates/job-namespace-client-ceph-config.yaml
+++ b/ceph-provisioners/templates/job-namespace-client-ceph-config.yaml
@@ -88,6 +88,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ $serviceAccountName }}
+  labels:
+{{ tuple $envAll "ceph" "client-ceph-config-generator" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   template:
     metadata:
diff --git a/ceph-provisioners/templates/job-namespace-client-key-cleaner.yaml b/ceph-provisioners/templates/job-namespace-client-key-cleaner.yaml
index 189f32fcc..746911baf 100644
--- a/ceph-provisioners/templates/job-namespace-client-key-cleaner.yaml
+++ b/ceph-provisioners/templates/job-namespace-client-key-cleaner.yaml
@@ -51,6 +51,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ $serviceAccountName }}
+  labels:
+{{ tuple $envAll "ceph" "client-key-cleaner" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     "helm.sh/hook": pre-delete
 spec:
diff --git a/ceph-provisioners/templates/job-namespace-client-key.yaml b/ceph-provisioners/templates/job-namespace-client-key.yaml
index 1bcc15d3b..426a8ff65 100644
--- a/ceph-provisioners/templates/job-namespace-client-key.yaml
+++ b/ceph-provisioners/templates/job-namespace-client-key.yaml
@@ -88,6 +88,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ $serviceAccountName }}
+  labels:
+{{ tuple $envAll "ceph" "client-key-generator" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   template:
     metadata:
diff --git a/ceph-rgw/Chart.yaml b/ceph-rgw/Chart.yaml
index caa070237..71c5b3e8f 100644
--- a/ceph-rgw/Chart.yaml
+++ b/ceph-rgw/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph RadosGW
 name: ceph-rgw
-version: 0.1.15
+version: 0.1.16
 home: https://github.com/ceph/ceph
 ...
diff --git a/ceph-rgw/templates/job-bootstrap.yaml b/ceph-rgw/templates/job-bootstrap.yaml
index 073188dcf..636896913 100644
--- a/ceph-rgw/templates/job-bootstrap.yaml
+++ b/ceph-rgw/templates/job-bootstrap.yaml
@@ -50,6 +50,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: ceph-rgw-bootstrap
+  labels:
+{{ tuple $envAll "ceph" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/ceph-rgw/templates/job-rgw-placement-targets.yaml b/ceph-rgw/templates/job-rgw-placement-targets.yaml
index 9a5155a69..45b9486ad 100644
--- a/ceph-rgw/templates/job-rgw-placement-targets.yaml
+++ b/ceph-rgw/templates/job-rgw-placement-targets.yaml
@@ -51,6 +51,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: ceph-rgw-placement-targets
+  labels:
+{{ tuple $envAll "ceph" "rgw-placement-targets" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/ceph-rgw/templates/job-rgw-restart.yaml b/ceph-rgw/templates/job-rgw-restart.yaml
index 8bd1ba1b0..fdbec8f9d 100644
--- a/ceph-rgw/templates/job-rgw-restart.yaml
+++ b/ceph-rgw/templates/job-rgw-restart.yaml
@@ -51,6 +51,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: ceph-rgw-restart
+  labels:
+{{ tuple $envAll "ceph" "rgw-restart" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/ceph-rgw/templates/job-rgw-storage-init.yaml b/ceph-rgw/templates/job-rgw-storage-init.yaml
index 6a66c62ea..4c3a6ed3e 100644
--- a/ceph-rgw/templates/job-rgw-storage-init.yaml
+++ b/ceph-rgw/templates/job-rgw-storage-init.yaml
@@ -50,6 +50,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: ceph-rgw-storage-init
+  labels:
+{{ tuple $envAll "ceph" "rgw-storage-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   template:
     metadata:
diff --git a/ceph-rgw/templates/job-s3-admin.yaml b/ceph-rgw/templates/job-s3-admin.yaml
index e8e8db2a6..d796395b7 100644
--- a/ceph-rgw/templates/job-s3-admin.yaml
+++ b/ceph-rgw/templates/job-s3-admin.yaml
@@ -52,6 +52,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: ceph-rgw-s3-admin
+  labels:
+{{ tuple $envAll "ceph" "rgw-s3-admin" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml
index 4a4da0fd4..e2e1040f8 100644
--- a/elasticsearch/Chart.yaml
+++ b/elasticsearch/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v7.6.2
 description: OpenStack-Helm ElasticSearch
 name: elasticsearch
-version: 0.2.11
+version: 0.2.12
 home: https://www.elastic.co/
 sources:
   - https://github.com/elastic/elasticsearch
diff --git a/elasticsearch/templates/job-elasticsearch-template.yaml b/elasticsearch/templates/job-elasticsearch-template.yaml
index c8355620b..768c60650 100644
--- a/elasticsearch/templates/job-elasticsearch-template.yaml
+++ b/elasticsearch/templates/job-elasticsearch-template.yaml
@@ -25,6 +25,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: create-elasticsearch-templates
+  labels:
+{{ tuple $envAll "elasticsearch" "create-templates" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/gnocchi/Chart.yaml b/gnocchi/Chart.yaml
index c3bb2386d..82642ff58 100644
--- a/gnocchi/Chart.yaml
+++ b/gnocchi/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v3.0.3
 description: OpenStack-Helm Gnocchi
 name: gnocchi
-version: 0.1.2
+version: 0.1.3
 home: https://gnocchi.xyz/
 icon: https://gnocchi.xyz/_static/gnocchi-logo.png
 sources:
diff --git a/gnocchi/templates/job-clean.yaml b/gnocchi/templates/job-clean.yaml
index 11fa3ea0d..3e294bf13 100644
--- a/gnocchi/templates/job-clean.yaml
+++ b/gnocchi/templates/job-clean.yaml
@@ -48,6 +48,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ print "gnocchi-clean" }}
+  labels:
+{{ tuple $envAll "gnocchi" "clean" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     "helm.sh/hook": pre-delete
     "helm.sh/hook-delete-policy": hook-succeeded
diff --git a/gnocchi/templates/job-db-init-indexer.yaml b/gnocchi/templates/job-db-init-indexer.yaml
index cde2c0bf4..ab0780438 100644
--- a/gnocchi/templates/job-db-init-indexer.yaml
+++ b/gnocchi/templates/job-db-init-indexer.yaml
@@ -22,6 +22,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: gnocchi-db-init-indexer
+  labels:
+{{ tuple $envAll "gnocchi" "db-init-indexer" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   template:
     metadata:
diff --git a/gnocchi/templates/job-db-sync.yaml b/gnocchi/templates/job-db-sync.yaml
index a30356c88..603918474 100644
--- a/gnocchi/templates/job-db-sync.yaml
+++ b/gnocchi/templates/job-db-sync.yaml
@@ -22,6 +22,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: gnocchi-db-sync
+  labels:
+{{ tuple $envAll "gnocchi" "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   template:
     metadata:
diff --git a/gnocchi/templates/job-storage-init.yaml b/gnocchi/templates/job-storage-init.yaml
index 9e2aea42e..e2736a5e9 100644
--- a/gnocchi/templates/job-storage-init.yaml
+++ b/gnocchi/templates/job-storage-init.yaml
@@ -50,6 +50,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: gnocchi-storage-init
+  labels:
+{{ tuple $envAll "gnocchi" "storage-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   template:
     metadata:
diff --git a/grafana/Chart.yaml b/grafana/Chart.yaml
index ed808766a..c1dd76458 100644
--- a/grafana/Chart.yaml
+++ b/grafana/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v7.4.5
 description: OpenStack-Helm Grafana
 name: grafana
-version: 0.1.9
+version: 0.1.10
 home: https://grafana.com/
 sources:
   - https://github.com/grafana/grafana
diff --git a/grafana/templates/job-db-init-session.yaml b/grafana/templates/job-db-init-session.yaml
index 2988b9b0b..a23fbaba6 100644
--- a/grafana/templates/job-db-init-session.yaml
+++ b/grafana/templates/job-db-init-session.yaml
@@ -22,6 +22,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: grafana-db-init-session
+  labels:
+{{ tuple $envAll "grafana" "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/grafana/templates/job-db-init.yaml b/grafana/templates/job-db-init.yaml
index 9b87d94f8..c69ea7277 100644
--- a/grafana/templates/job-db-init.yaml
+++ b/grafana/templates/job-db-init.yaml
@@ -22,6 +22,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: grafana-db-init
+  labels:
+{{ tuple $envAll "grafana" "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/grafana/templates/job-db-session-sync.yaml b/grafana/templates/job-db-session-sync.yaml
index 3db6fd013..cc2c1d7ef 100644
--- a/grafana/templates/job-db-session-sync.yaml
+++ b/grafana/templates/job-db-session-sync.yaml
@@ -22,6 +22,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: grafana-db-session-sync
+  labels:
+{{ tuple $envAll "grafana" "db-session-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/grafana/templates/job-set-admin-user.yaml b/grafana/templates/job-set-admin-user.yaml
index bc08c33d4..388ab830b 100644
--- a/grafana/templates/job-set-admin-user.yaml
+++ b/grafana/templates/job-set-admin-user.yaml
@@ -22,6 +22,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: grafana-set-admin-user
+  labels:
+{{ tuple $envAll "grafana" "set-admin-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/helm-toolkit/Chart.yaml b/helm-toolkit/Chart.yaml
index 2c566e915..c9a13eed4 100644
--- a/helm-toolkit/Chart.yaml
+++ b/helm-toolkit/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Helm-Toolkit
 name: helm-toolkit
-version: 0.2.22
+version: 0.2.23
 home: https://docs.openstack.org/openstack-helm
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/OpenStack-Helm/OpenStack_Project_OpenStackHelm_vertical.png
 sources:
diff --git a/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/helm-toolkit/templates/manifests/_job-bootstrap.tpl
index 6bd0898e2..65020e5dc 100644
--- a/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+++ b/helm-toolkit/templates/manifests/_job-bootstrap.tpl
@@ -44,6 +44,11 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ printf "%s-%s" $serviceNamePretty "bootstrap" | quote }}
+  labels:
+{{ tuple $envAll $serviceName "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
+{{- if $jobLabels }}
+{{ toYaml $jobLabels | indent 4 }}
+{{- end }}
   annotations:
 {{- if $jobAnnotations }}
 {{ toYaml $jobAnnotations | indent 4 }}
diff --git a/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl b/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl
index cfd64ff02..6edbdb3ae 100644
--- a/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl
+++ b/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl
@@ -45,6 +45,11 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ printf "%s-%s" $serviceNamePretty "db-drop" | quote }}
+  labels:
+{{ tuple $envAll $serviceName "db-drop" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
+{{- if $jobLabels }}
+{{ toYaml $jobLabels | indent 4 }}
+{{- end }}
   annotations:
     "helm.sh/hook": pre-delete
     "helm.sh/hook-delete-policy": hook-succeeded
diff --git a/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl b/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
index 446339737..bfed19684 100644
--- a/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
+++ b/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
@@ -45,6 +45,11 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ printf "%s-%s" $serviceNamePretty "db-init" | quote }}
+  labels:
+{{ tuple $envAll $serviceName "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
+{{- if $jobLabels }}
+{{ toYaml $jobLabels | indent 4 }}
+{{- end }}
   annotations:
 {{- if $jobAnnotations }}
 {{ toYaml $jobAnnotations | indent 4 }}
diff --git a/helm-toolkit/templates/manifests/_job-db-sync.tpl b/helm-toolkit/templates/manifests/_job-db-sync.tpl
index 979211d32..71ff924b9 100644
--- a/helm-toolkit/templates/manifests/_job-db-sync.tpl
+++ b/helm-toolkit/templates/manifests/_job-db-sync.tpl
@@ -42,6 +42,11 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ printf "%s-%s" $serviceNamePretty "db-sync" | quote }}
+  labels:
+{{ tuple $envAll $serviceName "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
+{{- if $jobLabels }}
+{{ toYaml $jobLabels | indent 4 }}
+{{- end }}
   annotations:
 {{- if $jobAnnotations }}
 {{ toYaml $jobAnnotations | indent 4 }}
diff --git a/helm-toolkit/templates/manifests/_job-ks-endpoints.tpl b/helm-toolkit/templates/manifests/_job-ks-endpoints.tpl
index 6df37b6e2..e06aeb65e 100644
--- a/helm-toolkit/templates/manifests/_job-ks-endpoints.tpl
+++ b/helm-toolkit/templates/manifests/_job-ks-endpoints.tpl
@@ -45,6 +45,11 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ printf "%s-%s" $serviceNamePretty "ks-endpoints" | quote }}
+  labels:
+{{ tuple $envAll $serviceName "ks-endpoints" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
+{{- if $jobLabels }}
+{{ toYaml $jobLabels | indent 4 }}
+{{- end }}
   annotations:
 {{- if $jobAnnotations }}
 {{ toYaml $jobAnnotations | indent 4 }}
diff --git a/helm-toolkit/templates/manifests/_job-ks-service.tpl b/helm-toolkit/templates/manifests/_job-ks-service.tpl
index ca9f6c3e9..93e64e1d4 100644
--- a/helm-toolkit/templates/manifests/_job-ks-service.tpl
+++ b/helm-toolkit/templates/manifests/_job-ks-service.tpl
@@ -45,6 +45,11 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ printf "%s-%s" $serviceNamePretty "ks-service" | quote }}
+  labels:
+{{ tuple $envAll $serviceName "ks-service" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
+{{- if $jobLabels }}
+{{ toYaml $jobLabels | indent 4 }}
+{{- end }}
   annotations:
 {{- if $jobAnnotations }}
 {{ toYaml $jobAnnotations | indent 4 }}
diff --git a/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl b/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl
index 42f237039..cb90b44f6 100644
--- a/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl
+++ b/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl
@@ -45,6 +45,11 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ printf "%s-%s" $serviceUserPretty "ks-user" | quote }}
+  labels:
+{{ tuple $envAll $serviceName "ks-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
+{{- if $jobLabels }}
+{{ toYaml $jobLabels | indent 4 }}
+{{- end }}
   annotations:
 {{- if $jobAnnotations }}
 {{ toYaml $jobAnnotations | indent 4 }}
diff --git a/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl b/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl
index d003f123f..aae71ac50 100644
--- a/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl
+++ b/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl
@@ -35,6 +35,11 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ printf "%s-%s" $serviceUserPretty "rabbit-init" | quote }}
+  labels:
+{{ tuple $envAll $serviceName "rabbit-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
+{{- if $jobLabels }}
+{{ toYaml $jobLabels | indent 4 }}
+{{- end }}
   annotations:
 {{- if $jobAnnotations }}
 {{ toYaml $jobAnnotations | indent 4 }}
diff --git a/helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl b/helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl
index bea68762d..42bb85488 100644
--- a/helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl
+++ b/helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl
@@ -41,6 +41,11 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ printf "%s-%s" $serviceNamePretty "s3-bucket" | quote }}
+  labels:
+{{ tuple $envAll $serviceName "s3-bucket" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
+{{- if $jobLabels }}
+{{ toYaml $jobLabels | indent 4 }}
+{{- end }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 {{- if $jobAnnotations }}
diff --git a/helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl b/helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl
index 36af63f3b..36fe3582c 100644
--- a/helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl
+++ b/helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl
@@ -38,6 +38,11 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ printf "%s-%s" $serviceNamePretty "s3-user" | quote }}
+  labels:
+{{ tuple $envAll $serviceName "s3-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
+{{- if $jobLabels }}
+{{ toYaml $jobLabels | indent 4 }}
+{{- end }}
   annotations:
     "helm.sh/hook-delete-policy": before-hook-creation
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
diff --git a/helm-toolkit/templates/manifests/_job_image_repo_sync.tpl b/helm-toolkit/templates/manifests/_job_image_repo_sync.tpl
index 2e67006b4..c1609195f 100644
--- a/helm-toolkit/templates/manifests/_job_image_repo_sync.tpl
+++ b/helm-toolkit/templates/manifests/_job_image_repo_sync.tpl
@@ -38,6 +38,11 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ printf "%s-%s" $serviceNamePretty "image-repo-sync" | quote }}
+  labels:
+{{ tuple $envAll $serviceName "image-repo-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
+{{- if $jobLabels }}
+{{ toYaml $jobLabels | indent 4 }}
+{{- end }}
   annotations:
     "helm.sh/hook-delete-policy": before-hook-creation
 {{- if $jobAnnotations }}
diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml
index f6b3f1ecd..973c19dd1 100644
--- a/kibana/Chart.yaml
+++ b/kibana/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v7.1.0
 description: OpenStack-Helm Kibana
 name: kibana
-version: 0.1.6
+version: 0.1.7
 home: https://www.elastic.co/products/kibana
 sources:
   - https://github.com/elastic/kibana
diff --git a/kibana/templates/job-flush-kibana-metadata.yaml b/kibana/templates/job-flush-kibana-metadata.yaml
index 1d4f9f3fb..c657b1202 100644
--- a/kibana/templates/job-flush-kibana-metadata.yaml
+++ b/kibana/templates/job-flush-kibana-metadata.yaml
@@ -34,6 +34,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: flush-kibana-metadata
+  labels:
+{{ tuple $envAll "kibana" "flush_kibana_metadata" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   backoffLimit: {{ .Values.jobs.flush_kibana_metadata.backoffLimit }}
   template:
diff --git a/kibana/templates/job-register-kibana-indexes.yaml b/kibana/templates/job-register-kibana-indexes.yaml
index 3597ae78a..f8522c689 100644
--- a/kibana/templates/job-register-kibana-indexes.yaml
+++ b/kibana/templates/job-register-kibana-indexes.yaml
@@ -22,6 +22,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: register-kibana-indexes
+  labels:
+{{ tuple $envAll "kibana" "register_kibana_indexes" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-delete-policy": before-hook-creation
diff --git a/mariadb/Chart.yaml b/mariadb/Chart.yaml
index 37b8e26c9..fe21ecc7b 100644
--- a/mariadb/Chart.yaml
+++ b/mariadb/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v10.2.31
 description: OpenStack-Helm MariaDB
 name: mariadb
-version: 0.2.7
+version: 0.2.8
 home: https://mariadb.com/kb/en/
 icon: http://badges.mariadb.org/mariadb-badge-180x60.png
 sources:
diff --git a/mariadb/templates/monitoring/prometheus/exporter-job-create-user.yaml b/mariadb/templates/monitoring/prometheus/exporter-job-create-user.yaml
index 7d9f73f65..3352ab8d6 100644
--- a/mariadb/templates/monitoring/prometheus/exporter-job-create-user.yaml
+++ b/mariadb/templates/monitoring/prometheus/exporter-job-create-user.yaml
@@ -22,6 +22,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: exporter-create-sql-user
+  labels:
+{{ tuple $envAll "prometheus-mysql-exporter" "create-sql-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 {{- if .Values.helm3_hook }}
   annotations:
     "helm.sh/hook": "post-install,post-upgrade"
diff --git a/postgresql/Chart.yaml b/postgresql/Chart.yaml
index 2dfe64a9a..313ce1304 100644
--- a/postgresql/Chart.yaml
+++ b/postgresql/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v9.6
 description: OpenStack-Helm PostgreSQL
 name: postgresql
-version: 0.1.9
+version: 0.1.10
 home: https://www.postgresql.org
 sources:
   - https://github.com/postgres/postgres
diff --git a/postgresql/templates/monitoring/prometheus/exporter-job-create-user.yaml b/postgresql/templates/monitoring/prometheus/exporter-job-create-user.yaml
index 2467fbbd8..97cb7c85d 100644
--- a/postgresql/templates/monitoring/prometheus/exporter-job-create-user.yaml
+++ b/postgresql/templates/monitoring/prometheus/exporter-job-create-user.yaml
@@ -22,6 +22,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: prometheus-postgresql-exporter-create-user
+  labels:
+{{ tuple $envAll "prometheus_postgresql_exporter" "create_user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   template:
     metadata:
diff --git a/powerdns/Chart.yaml b/powerdns/Chart.yaml
index 0df22c541..c159e383d 100644
--- a/powerdns/Chart.yaml
+++ b/powerdns/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v4.1.10
 description: OpenStack-Helm PowerDNS
 name: powerdns
-version: 0.1.2
+version: 0.1.3
 home: https://www.powerdns.com/
 maintainers:
   - name: OpenStack-Helm Authors
diff --git a/powerdns/templates/job-db-sync.yaml b/powerdns/templates/job-db-sync.yaml
index 9509979af..ff2964076 100644
--- a/powerdns/templates/job-db-sync.yaml
+++ b/powerdns/templates/job-db-sync.yaml
@@ -23,6 +23,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ $serviceAccountName }}
+  labels:
+{{ tuple $envAll "powerdns" "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   template:
     metadata:
diff --git a/prometheus-openstack-exporter/Chart.yaml b/prometheus-openstack-exporter/Chart.yaml
index 92ea1cfcb..d90419e4e 100644
--- a/prometheus-openstack-exporter/Chart.yaml
+++ b/prometheus-openstack-exporter/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack Metrics Exporter for Prometheus
 name: prometheus-openstack-exporter
-version: 0.1.4
+version: 0.1.5
 home: https://github.com/openstack/openstack-helm-infra
 sources:
   - https://opendev.org/openstack/openstack-helm-infra
diff --git a/prometheus-openstack-exporter/templates/job-ks-user.yaml b/prometheus-openstack-exporter/templates/job-ks-user.yaml
index 294cd35aa..04d126a3f 100644
--- a/prometheus-openstack-exporter/templates/job-ks-user.yaml
+++ b/prometheus-openstack-exporter/templates/job-ks-user.yaml
@@ -22,6 +22,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: prometheus-openstack-exporter-ks-user
+  labels:
+{{ tuple $envAll "prometheus-openstack-exporter" "ks-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   template:
     metadata:
diff --git a/registry/Chart.yaml b/registry/Chart.yaml
index cd5d88b25..c23b9cb26 100644
--- a/registry/Chart.yaml
+++ b/registry/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v2.0.0
 description: OpenStack-Helm Docker Registry
 name: registry
-version: 0.1.3
+version: 0.1.4
 home: https://github.com/kubernetes/ingress
 sources:
   - https://opendev.org/openstack/openstack-helm
diff --git a/registry/templates/job-bootstrap.yaml b/registry/templates/job-bootstrap.yaml
index 760fa9af1..8fc3a8012 100644
--- a/registry/templates/job-bootstrap.yaml
+++ b/registry/templates/job-bootstrap.yaml
@@ -23,6 +23,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: docker-bootstrap
+  labels:
+{{ tuple $envAll "docker" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/releasenotes/notes/calico.yaml b/releasenotes/notes/calico.yaml
index 2abe432e0..c184ca7e2 100644
--- a/releasenotes/notes/calico.yaml
+++ b/releasenotes/notes/calico.yaml
@@ -3,4 +3,5 @@ calico:
   - 0.1.0 Initial Chart
   - 0.1.1 Change helm-toolkit dependency version to ">= 0.1.0"
   - 0.1.2 Use full image ref for docker official images
+  - 0.1.3 Helm 3 - Fix Job labels
 ...
diff --git a/releasenotes/notes/ceph-client.yaml b/releasenotes/notes/ceph-client.yaml
index 3a6534f1e..fd52f2681 100644
--- a/releasenotes/notes/ceph-client.yaml
+++ b/releasenotes/notes/ceph-client.yaml
@@ -23,4 +23,5 @@ ceph-client:
   - 0.1.20 Export crash dumps when Ceph daemons crash
   - 0.1.21 Fix Ceph checkDNS script
   - 0.1.22 Set pg_num_min in all cases
+  - 0.1.23 Helm 3 - Fix Job labels
 ...
diff --git a/releasenotes/notes/ceph-mon.yaml b/releasenotes/notes/ceph-mon.yaml
index 26170b138..eac86a9d6 100644
--- a/releasenotes/notes/ceph-mon.yaml
+++ b/releasenotes/notes/ceph-mon.yaml
@@ -13,4 +13,5 @@ ceph-mon:
   - 0.1.10 Export crash dumps when Ceph daemons crash
   - 0.1.11 Correct mon-check executing binary and logic
   - 0.1.12 Fix Ceph checkDNS script
+  - 0.1.13 Helm 3 - Fix Job labels
 ...
diff --git a/releasenotes/notes/ceph-osd.yaml b/releasenotes/notes/ceph-osd.yaml
index 02081a3be..7babb5f0c 100644
--- a/releasenotes/notes/ceph-osd.yaml
+++ b/releasenotes/notes/ceph-osd.yaml
@@ -31,4 +31,5 @@ ceph-osd:
   - 0.1.28 Change var crash mount propagation to HostToContainer
   - 0.1.29 Fix Ceph checkDNS script
   - 0.1.30 Ceph OSD log-runner container should run as ceph user
+  - 0.1.31 Helm 3 - Fix Job labels
 ...
diff --git a/releasenotes/notes/ceph-provisioners.yaml b/releasenotes/notes/ceph-provisioners.yaml
index 1b6988286..53b22da8e 100644
--- a/releasenotes/notes/ceph-provisioners.yaml
+++ b/releasenotes/notes/ceph-provisioners.yaml
@@ -13,4 +13,5 @@ ceph-provisioners:
   - 0.1.11 Limit Ceph Provisioner Container Security Contexts
   - 0.1.12 Add ceph mon v2 port for ceph csi provisioner
   - 0.1.13 Fix ceph-provisioner rbd-healer error
+  - 0.1.14 Helm 3 - Fix Job labels
 ...
diff --git a/releasenotes/notes/ceph-rgw.yaml b/releasenotes/notes/ceph-rgw.yaml
index 595b90a9f..813bdf8fc 100644
--- a/releasenotes/notes/ceph-rgw.yaml
+++ b/releasenotes/notes/ceph-rgw.yaml
@@ -16,4 +16,5 @@ ceph-rgw:
   - 0.1.13 Add configmap hash for keystone rgw
   - 0.1.14 Disable crash dumps for rgw
   - 0.1.15 Correct rgw placement target functions
+  - 0.1.16 Helm 3 - Fix Job labels
 ...
diff --git a/releasenotes/notes/elasticsearch.yaml b/releasenotes/notes/elasticsearch.yaml
index 4a0f020d1..8a6bf7ee7 100644
--- a/releasenotes/notes/elasticsearch.yaml
+++ b/releasenotes/notes/elasticsearch.yaml
@@ -21,4 +21,5 @@ elasticsearch:
   - 0.2.9 Removed repo verification check from helm-test
   - 0.2.10 Enable TLS path between Prometheus-elasticsearch-exporter and Elasticsearch
   - 0.2.11 Enable TLS path between Curator and Elasticsearch
+  - 0.2.12 Helm 3 - Fix Job labels
 ...
diff --git a/releasenotes/notes/gnocchi.yaml b/releasenotes/notes/gnocchi.yaml
index 35339d725..a879598df 100644
--- a/releasenotes/notes/gnocchi.yaml
+++ b/releasenotes/notes/gnocchi.yaml
@@ -3,4 +3,5 @@ gnocchi:
   - 0.1.0 Initial Chart
   - 0.1.1 Change helm-toolkit dependency version to ">= 0.1.0"
   - 0.1.2 Use full image ref for docker official images
+  - 0.1.3 Helm 3 - Fix Job labels
 ...
diff --git a/releasenotes/notes/grafana.yaml b/releasenotes/notes/grafana.yaml
index b6735b5e6..f3a138a9c 100644
--- a/releasenotes/notes/grafana.yaml
+++ b/releasenotes/notes/grafana.yaml
@@ -10,4 +10,5 @@ grafana:
   - 0.1.7 Update Grafana version and Selenium script
   - 0.1.8 Use full image ref for docker official images
   - 0.1.9 Add Alertmanager dashboard to Grafana
+  - 0.1.10 Helm 3 - Fix Job labels
 ...
diff --git a/releasenotes/notes/helm-toolkit.yaml b/releasenotes/notes/helm-toolkit.yaml
index 568f65e72..f2fbb6e8b 100644
--- a/releasenotes/notes/helm-toolkit.yaml
+++ b/releasenotes/notes/helm-toolkit.yaml
@@ -29,4 +29,5 @@ helm-toolkit:
   - 0.2.20 Modify the template of rbac_role to make secrets accessible
   - 0.2.21 Fix issue with db backup error return code being eaten
   - 0.2.22 Add ability to set labels to add to resources
+  - 0.2.23 Helm 3 - Fix Job labels
 ...
diff --git a/releasenotes/notes/kibana.yaml b/releasenotes/notes/kibana.yaml
index ec8310813..9375c7569 100644
--- a/releasenotes/notes/kibana.yaml
+++ b/releasenotes/notes/kibana.yaml
@@ -7,4 +7,5 @@ kibana:
   - 0.1.4 Enable TLS for Kibana ingress path
   - 0.1.5 Use full image ref for docker official images
   - 0.1.6 Remove Kibana indices before pod start up
+  - 0.1.7 Helm 3 - Fix Job labels
 ...
diff --git a/releasenotes/notes/mariadb.yaml b/releasenotes/notes/mariadb.yaml
index d6d07f64e..8897e89f0 100644
--- a/releasenotes/notes/mariadb.yaml
+++ b/releasenotes/notes/mariadb.yaml
@@ -23,4 +23,5 @@ mariadb:
   - 0.2.5 Added helm hook for post-install and post-upgrade in prometheus exporter job.
   - 0.2.6 Update log format stream for mariadb
   - 0.2.7 add ingress resources
+  - 0.2.8 Helm 3 - Fix Job labels
 ...
diff --git a/releasenotes/notes/postgresql.yaml b/releasenotes/notes/postgresql.yaml
index aa6e6f6a1..cf873a83e 100644
--- a/releasenotes/notes/postgresql.yaml
+++ b/releasenotes/notes/postgresql.yaml
@@ -10,4 +10,5 @@ postgresql:
   - 0.1.7 postgres archive cleanup script
   - 0.1.8 Add tls to Postgresql
   - 0.1.9 Use full image ref for docker official images
+  - 0.1.10 Helm 3 - Fix Job labels
 ...
diff --git a/releasenotes/notes/powerdns.yaml b/releasenotes/notes/powerdns.yaml
index a619585ee..f0149b712 100644
--- a/releasenotes/notes/powerdns.yaml
+++ b/releasenotes/notes/powerdns.yaml
@@ -3,4 +3,5 @@ powerdns:
   - 0.1.0 Initial Chart
   - 0.1.1 Change helm-toolkit dependency version to ">= 0.1.0"
   - 0.1.2 Use full image ref for docker official images
+  - 0.1.3 Helm 3 - Fix Job labels
 ...
diff --git a/releasenotes/notes/prometheus-openstack-exporter.yaml b/releasenotes/notes/prometheus-openstack-exporter.yaml
index a11205ff0..b2ffa120e 100644
--- a/releasenotes/notes/prometheus-openstack-exporter.yaml
+++ b/releasenotes/notes/prometheus-openstack-exporter.yaml
@@ -5,4 +5,5 @@ prometheus-openstack-exporter:
   - 0.1.2 Unpin prometheus-openstack-exporter image
   - 0.1.3 Add possibility to use overrides for some charts
   - 0.1.4 Use full image ref for docker official images
+  - 0.1.5 Helm 3 - Fix Job labels
 ...
diff --git a/releasenotes/notes/registry.yaml b/releasenotes/notes/registry.yaml
index 79932e617..a4f2bab11 100644
--- a/releasenotes/notes/registry.yaml
+++ b/releasenotes/notes/registry.yaml
@@ -4,4 +4,5 @@ registry:
   - 0.1.1 Change helm-toolkit dependency version to ">= 0.1.0"
   - 0.1.2 Update to container image repo k8s.gcr.io
   - 0.1.3 Use full image ref for docker official images
+  - 0.1.4 Helm 3 - Fix Job labels
 ...