From ed4e3d5a7d3109139c8d6d9994803038026e9c6f Mon Sep 17 00:00:00 2001
From: disposab1e <48065501+disposab1e@users.noreply.github.com>
Date: Fri, 1 Nov 2019 00:15:18 +0100
Subject: [PATCH] Support OpenShift Routes

---
 charts/argo-cd/templates/argocd-server-route.yaml | 6 +++++-
 charts/argo-cd/values.yaml                        | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/charts/argo-cd/templates/argocd-server-route.yaml b/charts/argo-cd/templates/argocd-server-route.yaml
index dbc6e15f..4616ae6f 100644
--- a/charts/argo-cd/templates/argocd-server-route.yaml
+++ b/charts/argo-cd/templates/argocd-server-route.yaml
@@ -9,8 +9,12 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
+{{- with .Values.route.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
 spec:
-  host: {{ .Values.route.hostname | default "" | quote }}
+  host: {{ .Values.route.hostname | quote }}
   subdomain: ''
   to:
     kind: Service
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 9aa091d9..bcdd5b49 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -70,7 +70,6 @@ dexServer:
   volumes: []
 
 # terminate tls at ArgoCD level
-# Consider using 'route.enabled: true' if you want to access Argo CD from inside OpenShift
 ingress:
   enabled: false
   annotations:
@@ -87,12 +86,14 @@ ingress:
     #     - chart-example.local
 
 # Create a OpenShift Route with SSL passthrough for UI and CLI
-# Consider setting 'hostname' e.g. https://argocd.apps-crc.testing/ using your Default Ingress Controller Domain
+# Consider setting 'hostname' e.g. 'argocd.apps-crc.testing' using your Default Ingress Controller Domain.
 # Find your domain with: kubectl describe --namespace=openshift-ingress-operator ingresscontroller/default | grep Domain:
 # If 'hostname' is an empty string "" OpenShift will create a hostname for you.
 route:
   enabled: false
   hostname: ""
+  annotations:
+    {}
 
 certificate:
   enabled: false