From 904b549c46bfd155d45be80a90e36874f39fb746 Mon Sep 17 00:00:00 2001
From: Tyler Auerbeck <tauerbec@redhat.com>
Date: Mon, 20 Apr 2020 14:42:55 -0400
Subject: [PATCH] Update default openshift.enabled value; Fix
 argocd-repo-server env template

---
 .../templates/argocd-repo-server/deployment.yaml    | 13 ++++++-------
 charts/argo-cd/values.yaml                          |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
index 0ff38562..2bc011a5 100755
--- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
@@ -67,17 +67,16 @@ spec:
         {{- if .Values.repoServer.containerSecurityContext }}
         securityContext: {{- toYaml .Values.repoServer.containerSecurityContext | nindent 10 }}
         {{- end }}
-{{- if .Values.openshift.enabled }}
+{{- if or (.Values.repoServer.env) (.Values.openshift.enabled) }}
         env:
-        - name: USER_NAME
-          value: argocd
 {{- if .Values.repoServer.env }}
 {{- toYaml .Values.repoServer.env | nindent 8 }}
 {{- end }}
-        {{- else if .Values.repoServer.env }}
-        env:
-{{- toYaml .Values.repoServer.env | nindent 8 }}
-        {{- end }}
+{{- if .Values.openshift.enabled }}
+        - name: USER_NAME
+          value: argocd
+{{- end }}
+{{- end }}
         volumeMounts:
         {{- if .Values.repoServer.volumeMounts }}
 {{- toYaml .Values.repoServer.volumeMounts | nindent 8}}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 66cd5817..bc1cf90b 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -792,4 +792,4 @@ configs:
     # argocdServerAdminPasswordMtime: "2006-01-02T15:04:05Z"
 
 openshift:
-  enabled: true
+  enabled: false