From 4278bc8d3812a37265ee158905f592448e801c50 Mon Sep 17 00:00:00 2001
From: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
Date: Fri, 21 May 2021 16:50:41 +0200
Subject: [PATCH] Apply suggestions from code review

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
---
 .../templates/argocd-application-controller/deployment.yaml    | 3 +--
 charts/argo-cd/templates/argocd-repo-server/deployment.yaml    | 3 +--
 charts/argo-cd/templates/argocd-server/deployment.yaml         | 3 +--
 charts/argo-cd/templates/dex/deployment.yaml                   | 3 +--
 charts/argo-cd/templates/redis/deployment.yaml                 | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
index f19251f1..7902be76 100755
--- a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
@@ -72,8 +72,7 @@ spec:
 {{- toYaml .Values.controller.env | nindent 8 }}
         {{- end }}
         {{- with .Values.controller.envFrom }}
-        envFrom:
-{{- toYaml . | nindent 8 }}
+        envFrom: {{- toYaml . | nindent 8 }}
         {{- end }}
         ports:
         - name: controller
diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
index d48bbae9..b0458fad 100755
--- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
@@ -68,8 +68,7 @@ spec:
 {{- end }}
 {{- end }}
         {{- with .Values.openshift.envFrom }}
-        envFrom:
-{{- toYaml . | nindent 8 }}
+        envFrom: {{- toYaml . | nindent 8 }}
         {{- end }}
         volumeMounts:
         {{- if .Values.repoServer.volumeMounts }}
diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml
index 2e06ddc3..44b89c0e 100755
--- a/charts/argo-cd/templates/argocd-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-server/deployment.yaml
@@ -69,8 +69,7 @@ spec:
 {{- toYaml .Values.server.env | nindent 8 }}
         {{- end }}
         {{- with .Values.server.envFrom }}
-        envFrom:
-{{- toYaml . | nindent 8 }}
+        envFrom: {{- toYaml . | nindent 8 }}
         {{- end }}
         volumeMounts:
         {{- if .Values.server.volumeMounts }}
diff --git a/charts/argo-cd/templates/dex/deployment.yaml b/charts/argo-cd/templates/dex/deployment.yaml
index ecf044d8..557140ce 100755
--- a/charts/argo-cd/templates/dex/deployment.yaml
+++ b/charts/argo-cd/templates/dex/deployment.yaml
@@ -64,8 +64,7 @@ spec:
 {{- toYaml .Values.dex.env | nindent 8 }}
         {{- end }}
         {{- with .Values.dex.envFrom }}
-        envFrom:
-{{- toYaml . | nindent 8 }}
+        envFrom: {{- toYaml . | nindent 8 }}
         {{- end }}
         ports:
         - name: http
diff --git a/charts/argo-cd/templates/redis/deployment.yaml b/charts/argo-cd/templates/redis/deployment.yaml
index e24b0eea..a6f0c46a 100755
--- a/charts/argo-cd/templates/redis/deployment.yaml
+++ b/charts/argo-cd/templates/redis/deployment.yaml
@@ -54,8 +54,7 @@ spec:
 {{- toYaml .Values.redis.env | nindent 8 }}
         {{- end }}
         {{- with .Values.redis.envFrom }}
-        envFrom:
-{{- toYaml . | nindent 8 }}
+        envFrom: {{- toYaml . | nindent 8 }}
         {{- end }}
         ports:
         - containerPort: {{ .Values.redis.containerPort }}