From 290c5fed1e34133522ef9a6326ad6ac90317c371 Mon Sep 17 00:00:00 2001
From: Tyler Auerbeck <tauerbec@redhat.com>
Date: Tue, 24 Mar 2020 01:08:14 -0400
Subject: [PATCH] Fix/Enhance Routes; Add uid workaround for repo server

---
 .../templates/argocd-repo-server/deployment.yaml     | 12 +++++++++++-
 charts/argo-cd/templates/argocd-server/route.yaml    |  6 ++++--
 charts/argo-cd/values.yaml                           |  5 ++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
index ff6d796c..9229330f 100755
--- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
@@ -52,6 +52,9 @@ spec:
         imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.repoServer.image.imagePullPolicy }}
         command:
         - argocd-repo-server
+        {{- if .Values.openshift.enabled }}
+        - uid_entrypoint.sh
+        {{- end }}
         {{- if .Values.redis.enabled }}
         - --redis
         - {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}
@@ -64,7 +67,14 @@ spec:
         {{- if .Values.repoServer.containerSecurityContext }}
         securityContext: {{- toYaml .Values.repoServer.containerSecurityContext | nindent 10 }}
         {{- end }}
-        {{- if .Values.repoServer.env }}
+{{- if .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 }}
diff --git a/charts/argo-cd/templates/argocd-server/route.yaml b/charts/argo-cd/templates/argocd-server/route.yaml
index f5952a13..775a0a2f 100644
--- a/charts/argo-cd/templates/argocd-server/route.yaml
+++ b/charts/argo-cd/templates/argocd-server/route.yaml
@@ -23,7 +23,9 @@ spec:
   port:
     targetPort: https
   tls:
-    termination: passthrough
-    insecureEdgeTerminationPolicy: None
+    termination: {{ .Values.server.route.termination_type | default "passthrough" }}
+    insecureEdgeTerminationPolicy: {{ .Values.server.route.termination_policy | default "None" }} 
   wildcardPolicy: None
+status:
+  ingress: []
 {{- end }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index cef83273..030dfaeb 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -167,7 +167,7 @@ dex:
 
   image:
     repository: quay.io/dexidp/dex
-    tag: v2.14.0
+    tag: v2.22.0
     imagePullPolicy: IfNotPresent
   initImage:
     repository:
@@ -786,3 +786,6 @@ configs:
     # argocdServerAdminPassword:
     # Password modification time defaults to current time if not set
     # argocdServerAdminPasswordMtime: "2006-01-02T15:04:05Z"
+
+openshift:
+  enabled: true