From f0e1ee9211ddf4cdb13ada6f783db604e0963268 Mon Sep 17 00:00:00 2001
From: JamesMurkin <jamesmurkin@hotmail.com>
Date: Thu, 28 Nov 2019 16:02:24 +0000
Subject: [PATCH] Fixing helm chart format

Currently the helm charts generated are misaligned
 - i.e Sections like ports was falling under resources and therefore was invalid
This allows them to be applied successfully
---
 deployment/armada/templates/deployment.yaml   | 2 +-
 deployment/executor/templates/deployment.yaml | 6 +++---
 deployment/executor/templates/secret.yaml     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/deployment/armada/templates/deployment.yaml b/deployment/armada/templates/deployment.yaml
index 67e53dec09d..85433300c83 100644
--- a/deployment/armada/templates/deployment.yaml
+++ b/deployment/armada/templates/deployment.yaml
@@ -37,7 +37,7 @@ spec:
             {{- toYaml .Values.env | nindent 12 -}}
           {{- end }}
           resources:
-            {{- toYaml .Values.resources | nindent 12 -}}
+            {{- toYaml .Values.resources | nindent 12 }}
           ports:
             - containerPort:  {{ .Values.applicationConfig.grpcPort }}
               protocol: TCP
diff --git a/deployment/executor/templates/deployment.yaml b/deployment/executor/templates/deployment.yaml
index e5ef5d16238..5d6389257bf 100644
--- a/deployment/executor/templates/deployment.yaml
+++ b/deployment/executor/templates/deployment.yaml
@@ -33,7 +33,7 @@ spec:
 {{ toYaml .Values.env | indent 12 }}
 {{- end }}
           resources:
-            {{- toYaml .Values.resources | nindent 12 -}}
+            {{- toYaml .Values.resources | nindent 12 }}
           ports:
             - containerPort: 9001
               protocol: TCP
@@ -49,9 +49,9 @@ spec:
           securityContext:
             allowPrivilegeEscalation: false
       nodeSelector:
-        {{- toYaml .Values.nodeSelector | nindent 8 -}}
+        {{- toYaml .Values.nodeSelector | nindent 8 }}
       tolerations:
-        {{- toYaml .Values.tolerations | nindent 8 -}}
+        {{- toYaml .Values.tolerations | nindent 8 }}
       volumes:
         - name: user-config
           secret:
diff --git a/deployment/executor/templates/secret.yaml b/deployment/executor/templates/secret.yaml
index 0b2edd5f58d..348f27a1d5d 100644
--- a/deployment/executor/templates/secret.yaml
+++ b/deployment/executor/templates/secret.yaml
@@ -9,5 +9,5 @@ type: Opaque
 data:
   {{ include "executor.config.filename" . }}: |
   {{- if .Values.applicationConfig }}
-  {{- toYaml .Values.applicationConfig | b64enc | indent 4 }}
+  {{ toYaml .Values.applicationConfig | b64enc | indent 4 }}
   {{- end }}