From 42b972181ae1dce72e00f47b7ec9902f05739963 Mon Sep 17 00:00:00 2001
From: Sean Eagan <sean.eagan@att.com>
Date: Thu, 5 Sep 2019 08:03:53 -0500
Subject: [PATCH] Fix release_uuid annotations

- Re-add annotation that was accidentally removed
- Fix wrong indentation
- Use programmatic indentation consistently

Change-Id: Ief9eb709d4db1152f133873bf68ef234649f20a9
---
 charts/armada/templates/deployment-api.yaml    | 3 ++-
 charts/tiller/templates/deployment-tiller.yaml | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/charts/armada/templates/deployment-api.yaml b/charts/armada/templates/deployment-api.yaml
index ddc9ce96..53171fcd 100644
--- a/charts/armada/templates/deployment-api.yaml
+++ b/charts/armada/templates/deployment-api.yaml
@@ -71,7 +71,7 @@ kind: Deployment
 metadata:
   name: armada-api
   annotations:
-    {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
+{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 4 }}
 spec:
   replicas: {{ .Values.pod.replicas.api }}
 {{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
@@ -80,6 +80,7 @@ spec:
       labels:
 {{ tuple $envAll "armada" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
       annotations:
+{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | 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 $prometheus_annotations | include "helm-toolkit.snippets.prometheus_pod_annotations" | indent 8 }}
diff --git a/charts/tiller/templates/deployment-tiller.yaml b/charts/tiller/templates/deployment-tiller.yaml
index 38ff79aa..dfb5e117 100644
--- a/charts/tiller/templates/deployment-tiller.yaml
+++ b/charts/tiller/templates/deployment-tiller.yaml
@@ -40,7 +40,7 @@ metadata:
     name: tiller
   name: tiller-deploy
   annotations:
-    {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
+{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 4 }}
 spec:
   replicas: 1
   selector:
@@ -58,7 +58,7 @@ spec:
         app: helm
         name: tiller
 {{ tuple $envAll "tiller" "deploy" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
-    annotations:
+      annotations:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}