From 27b4dc952c1a11bc6ddbdbcd83f6538abad8446c Mon Sep 17 00:00:00 2001
From: Sean Eagan <seaneagan1@gmail.com>
Date: Fri, 1 Oct 2021 11:21:52 -0500
Subject: [PATCH] Helm 3: Fix Job labels

See the dependency below for details.

Depends-On: https://review.opendev.org/c/openstack/openstack-helm-infra/+/811826
Change-Id: I100a68eb4cf457fba0783e41779f9fdc2c8daf78
---
 charts/shipyard/templates/job-airflow-db-init.yaml       | 2 ++
 charts/shipyard/templates/job-airflow-db-sync.yaml       | 2 ++
 charts/shipyard/templates/job-shipyard-db-auxiliary.yaml | 2 ++
 charts/shipyard/templates/job-shipyard-db-init.yaml      | 2 ++
 charts/shipyard/templates/job-shipyard-db-sync.yaml      | 2 ++
 tools/helm_tk.sh                                         | 2 +-
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/charts/shipyard/templates/job-airflow-db-init.yaml b/charts/shipyard/templates/job-airflow-db-init.yaml
index 7353d99e..45a50f51 100644
--- a/charts/shipyard/templates/job-airflow-db-init.yaml
+++ b/charts/shipyard/templates/job-airflow-db-init.yaml
@@ -23,6 +23,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: airflow-db-init
+  labels:
+{{ tuple $envAll "airflow" "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/charts/shipyard/templates/job-airflow-db-sync.yaml b/charts/shipyard/templates/job-airflow-db-sync.yaml
index fed1a677..40abc692 100644
--- a/charts/shipyard/templates/job-airflow-db-sync.yaml
+++ b/charts/shipyard/templates/job-airflow-db-sync.yaml
@@ -23,6 +23,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: airflow-db-sync
+  labels:
+{{ tuple $envAll "airflow" "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/charts/shipyard/templates/job-shipyard-db-auxiliary.yaml b/charts/shipyard/templates/job-shipyard-db-auxiliary.yaml
index 613b3f90..08eb4a6b 100644
--- a/charts/shipyard/templates/job-shipyard-db-auxiliary.yaml
+++ b/charts/shipyard/templates/job-shipyard-db-auxiliary.yaml
@@ -25,6 +25,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: shipyard-db-auxiliary
+  labels:
+{{ tuple $envAll "shipyard" "db-auxiliary" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/charts/shipyard/templates/job-shipyard-db-init.yaml b/charts/shipyard/templates/job-shipyard-db-init.yaml
index 06d16584..a25190e1 100644
--- a/charts/shipyard/templates/job-shipyard-db-init.yaml
+++ b/charts/shipyard/templates/job-shipyard-db-init.yaml
@@ -25,6 +25,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: shipyard-db-init
+  labels:
+{{ tuple $envAll "shipyard" "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/charts/shipyard/templates/job-shipyard-db-sync.yaml b/charts/shipyard/templates/job-shipyard-db-sync.yaml
index ee7bb796..dfea3bbb 100644
--- a/charts/shipyard/templates/job-shipyard-db-sync.yaml
+++ b/charts/shipyard/templates/job-shipyard-db-sync.yaml
@@ -25,6 +25,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: shipyard-db-sync
+  labels:
+{{ tuple $envAll "shipyard" "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 spec:
diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh
index 8e083b04..acee273d 100755
--- a/tools/helm_tk.sh
+++ b/tools/helm_tk.sh
@@ -17,7 +17,7 @@
 #
 HELM=$1
 
-HTK_STABLE_COMMIT=${HTK_COMMIT:-"9797d1b034529c9739c19a30193c3605321fcf91"}
+HTK_STABLE_COMMIT=${HTK_COMMIT:-"b1a247e7f54ab12d830ab74f7634457b4e43f3ef"}
 
 set -x