From 165c2df0719eb75caecf54bbe2294a4d4f353b7d Mon Sep 17 00:00:00 2001
From: Khris Richardson <krichardson@apexclearing.com>
Date: Thu, 27 Aug 2020 06:32:41 -0700
Subject: [PATCH] unnest convert settings from tls

---
 chart/helm-operator/templates/deployment.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/chart/helm-operator/templates/deployment.yaml b/chart/helm-operator/templates/deployment.yaml
index f7b778d68..dc856d2a3 100644
--- a/chart/helm-operator/templates/deployment.yaml
+++ b/chart/helm-operator/templates/deployment.yaml
@@ -268,6 +268,12 @@ spec:
         {{- else }}
         - --tiller-namespace={{ .Values.tillerNamespace }}
         {{- end }}
+        {{- if .Values.convert.releaseStorage }}
+        - --convert-release-storage={{ .Values.convert.releaseStorage }}
+        {{- end }}
+        {{- if .Values.convert.tillerOutCluster }}
+        - --convert-tiller-out-cluster={{ .Values.convert.tillerOutCluster }}
+        {{- end }}
         {{- if .Values.tls.enable }}
         - --tiller-tls-enable={{ .Values.tls.enable }}
         - --tiller-tls-key-path=/etc/fluxd/helm/{{ .Values.tls.keyFile }}
@@ -278,12 +284,6 @@ spec:
         {{- if .Values.tls.hostname }}
         - --tiller-tls-hostname={{ .Values.tls.hostname }}
         {{- end }}
-        {{- if .Values.convert.releaseStorage }}
-        - --convert-release-storage={{ .Values.convert.releaseStorage }}
-        {{- end }}
-        {{- if .Values.convert.tillerOutCluster }}
-        - --convert-tiller-out-cluster={{ .Values.convert.tillerOutCluster }}
-        {{- end }}
         {{- end }}
         {{- end }}
         {{- end }}