feat: Fix/Enhance Routes; Add uid workaround for repo server (#276)

* Fix/Enhance Routes; Add uid workaround for repo server

* Fix CI linting

* Update default openshift.enabled value; Fix argocd-repo-server env template

* Bump chart version to fix linting

Co-authored-by: Spencer Gilbert <Spencer.Gilbert@gmail.com>

charts/argo-cd/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.5.2"
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 2.2.7
+version: 2.2.8
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:

charts/argo-cd/templates/argocd-repo-server/deployment.yaml

@@ -53,6 +53,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 or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }}
         - --redis
         - {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}
@@ -65,10 +68,16 @@ spec:
         {{- if .Values.repoServer.containerSecurityContext }}
         securityContext: {{- toYaml .Values.repoServer.containerSecurityContext | nindent 10 }}
         {{- end }}
-        {{- if .Values.repoServer.env }}
+{{- if or (.Values.repoServer.env) (.Values.openshift.enabled) }}
         env:
+{{- if .Values.repoServer.env }}
 {{- toYaml .Values.repoServer.env | nindent 8 }}
-        {{- end }}
+{{- end }}
+{{- if .Values.openshift.enabled }}
+        - name: USER_NAME
+          value: argocd
+{{- end }}
+{{- end }}
         volumeMounts:
         {{- if .Values.repoServer.volumeMounts }}
 {{- toYaml .Values.repoServer.volumeMounts | nindent 8}}

charts/argo-cd/templates/argocd-server/route.yaml

@@ -23,7 +23,9 @@ spec:
   port:
     targetPort: https
   tls:
-    termination: passthrough
+    termination: {{ .Values.server.route.termination_type | default "passthrough" }}
-    insecureEdgeTerminationPolicy: None
+    insecureEdgeTerminationPolicy: {{ .Values.server.route.termination_policy | default "None" }} 
   wildcardPolicy: None
+status:
+  ingress: []
 {{- end }}

charts/argo-cd/values.yaml

@@ -171,7 +171,7 @@ dex:
 
   image:
     repository: quay.io/dexidp/dex
-    tag: v2.14.0
+    tag: v2.22.0
     imagePullPolicy: IfNotPresent
   initImage:
     repository:
@@ -813,3 +813,6 @@ configs:
     # argocdServerAdminPassword:
     # Password modification time defaults to current time if not set
     # argocdServerAdminPasswordMtime: "2006-01-02T15:04:05Z"
+
+openshift:
+  enabled: false