From fca7065e5ea729911eb4188800ead82274a91ada Mon Sep 17 00:00:00 2001
From: Yann Soubeyrand <yann.soubeyrand@gmx.fr>
Date: Fri, 13 Sep 2019 19:58:27 +0200
Subject: [PATCH] Use Argo CD URL as first ingress host (#106)

---
 charts/argo-cd/templates/argocd-server-ingress.yaml | 11 ++++++++++-
 charts/argo-cd/values.yaml                          |  3 +--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/charts/argo-cd/templates/argocd-server-ingress.yaml b/charts/argo-cd/templates/argocd-server-ingress.yaml
index d8b11266..459ce6bd 100644
--- a/charts/argo-cd/templates/argocd-server-ingress.yaml
+++ b/charts/argo-cd/templates/argocd-server-ingress.yaml
@@ -17,7 +17,16 @@ metadata:
 {{- end }}
 spec:
   rules:
-  {{- range .Values.ingress.hosts }}
+  {{- with .Values.config.url }}
+    - host: {{ . | quote }}
+      http:
+        paths:
+          - path: {{ $ingressPath }}
+            backend:
+              serviceName: argocd-server
+              servicePort: {{ $servicePortHttps }}
+  {{- end }}
+  {{- range .Values.ingress.additionalHosts }}
     - host: {{ . | quote }}
       http:
         paths:
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index ebd3e161..8eabbeca 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -64,8 +64,7 @@ ingress:
     # nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
     # nginx.ingress.kubernetes.io/ssl-passthrough: "true"
   path: /
-  hosts:
-    - argocd.example.com
+  additionalHosts: []
 clusterAdminAccess:
   enabled: true
 config: