From aa0cf8c8d09ad37b8ebcce677064e1b3b2211758 Mon Sep 17 00:00:00 2001
From: Phil Sphicas <phil.sphicas@att.com>
Date: Wed, 3 Jun 2020 01:59:00 +0000
Subject: [PATCH] Fix metadata labels for db-init and db-sync jobs

Corrects a recently introduced rendering error in the chart that
resulted in missing metadata labels for the drydock-db-init and
drydock-db-sync jobs.

https://review.opendev.org/#/c/724768

Change-Id: Ifa01bbc369a33ca3d5482c760a342d873736272e
---
 charts/drydock/templates/job-drydock-db-init.yaml | 2 +-
 charts/drydock/templates/job-drydock-db-sync.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/drydock/templates/job-drydock-db-init.yaml b/charts/drydock/templates/job-drydock-db-init.yaml
index a3306737..46c3b300 100644
--- a/charts/drydock/templates/job-drydock-db-init.yaml
+++ b/charts/drydock/templates/job-drydock-db-init.yaml
@@ -29,12 +29,12 @@ spec:
   template:
     metadata:
       labels:
+{{ tuple $envAll "drydock" "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
       annotations:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
 {{ dict "envAll" $envAll "podName" "drydock-db-init" "containerNames" (list "init" "drydock-db-init") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
-{{ tuple $envAll "drydock" "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
       restartPolicy: OnFailure
diff --git a/charts/drydock/templates/job-drydock-db-sync.yaml b/charts/drydock/templates/job-drydock-db-sync.yaml
index 1a162561..457c905f 100644
--- a/charts/drydock/templates/job-drydock-db-sync.yaml
+++ b/charts/drydock/templates/job-drydock-db-sync.yaml
@@ -29,12 +29,12 @@ spec:
   template:
     metadata:
       labels:
+{{ tuple $envAll "drydock" "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
       annotations:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
 {{ dict "envAll" $envAll "podName" "drydock-db-sync" "containerNames" (list "init" "drydock-db-sync") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
-{{ tuple $envAll "drydock" "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
       restartPolicy: OnFailure