From 46692e21d98c93b4ffed543f2e0ee84ab5912f74 Mon Sep 17 00:00:00 2001
From: Phil Sphicas <phil.sphicas@att.com>
Date: Mon, 1 Nov 2021 22:48:30 -0700
Subject: [PATCH] Fix nova-bootstrap job labels

Similar to earlier changes [0] [1], this change ensures that the labels
for the nova-boostrap job are consistently applied under .metadata and
.spec.template.metadata.

Unfortunately, there was a conflict in the "application" label that was
unresolvable in a backwards-compatible way.

    metadata:
      labels:
        application: nova-bootstrap
    spec:
      template:
        metadata:
          labels:
            application: nova
            ...

The standard helm-toolkit labels are now applied in both places, and the
application: nova-bootstrap label is removed.

0: https://review.opendev.org/c/openstack/openstack-helm/+/812233
1: https://review.opendev.org/c/openstack/openstack-helm/+/813300

Change-Id: I72275f3cf59ca8c1677922ca3b6f2e10b5578ab0
Depends-On: I0c892be5aba7ccd6e3c378e4e45a79d2df03c06a
---
 nova/Chart.yaml                   | 2 +-
 nova/templates/job-bootstrap.yaml | 2 +-
 releasenotes/notes/nova.yaml      | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nova/Chart.yaml b/nova/Chart.yaml
index 1cb74bccb4..60cc765741 100644
--- a/nova/Chart.yaml
+++ b/nova/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Nova
 name: nova
-version: 0.2.23
+version: 0.2.24
 home: https://docs.openstack.org/nova/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png
 sources:
diff --git a/nova/templates/job-bootstrap.yaml b/nova/templates/job-bootstrap.yaml
index 72c66f38e9..c105f567a5 100644
--- a/nova/templates/job-bootstrap.yaml
+++ b/nova/templates/job-bootstrap.yaml
@@ -29,7 +29,7 @@ kind: Job
 metadata:
   name: {{ $serviceAccountName | quote }}
   labels:
-    application: {{ $serviceAccountName | quote }}
+{{ tuple $envAll "nova" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   template:
     metadata:
diff --git a/releasenotes/notes/nova.yaml b/releasenotes/notes/nova.yaml
index a14e015728..b7ad3c250e 100644
--- a/releasenotes/notes/nova.yaml
+++ b/releasenotes/notes/nova.yaml
@@ -44,4 +44,5 @@ nova:
   - 0.2.21 Helm 3 - Fix Job Labels
   - 0.2.22 Update htk requirements repo
   - 0.2.23 Add option to enable extra wait for cell-setup-init
+  - 0.2.24 Fix nova-bootstrap job labels
 ...