From 7dff7e23ae589793e02a7de5e0dbf6abd456bd91 Mon Sep 17 00:00:00 2001
From: disposab1e <48065501+disposab1e@users.noreply.github.com>
Date: Thu, 7 Nov 2019 09:20:31 +0100
Subject: [PATCH] OpenShift Route (#153)

* OpenShift Route
* Bump Chart Version to 1.0.4
---
 charts/argo-cd/Chart.yaml                     |  2 +-
 charts/argo-cd/README.md                      |  4 ++-
 .../templates/argocd-server/route.yaml        | 30 +++++++++++++++++++
 charts/argo-cd/values.yaml                    |  8 +++++
 4 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 charts/argo-cd/templates/argocd-server/route.yaml

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 82ddd090..d357ee59 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.2.4"
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 1.0.3
+version: 1.0.4
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
 keywords:
diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md
index b63ae9e0..62562b5e 100644
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@@ -2,7 +2,7 @@ Argo CD Chart
 ======
 A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 
-Current chart version is `1.0.2`
+Current chart version is `1.0.4`
 
 Source code can be found [here](https://argoproj.github.io/argo-cd/)
 
@@ -147,6 +147,8 @@ $ helm install --name my-release argo/argo-cd
 | server.ingress.hosts | List of ingress hosts | `[]` |
 | server.ingress.labels | Additional ingress labels. | `{}` |
 | server.ingress.tls | Ingress TLS configuration. | `[]` |
+| server.route.enabled | Enable a OpenShift route for the server | `false` |
+| server.route.hostname | Hostname of OpenShift route | `""` |
 | server.livenessProbe.failureThreshold | int | `3` |
 | server.livenessProbe.initialDelaySeconds | int | `10` |
 | server.livenessProbe.periodSeconds | int | `10` |
diff --git a/charts/argo-cd/templates/argocd-server/route.yaml b/charts/argo-cd/templates/argocd-server/route.yaml
new file mode 100644
index 00000000..6473fd16
--- /dev/null
+++ b/charts/argo-cd/templates/argocd-server/route.yaml
@@ -0,0 +1,30 @@
+{{- if .Values.server.route.enabled -}}
+apiVersion: route.openshift.io/v1
+kind: Route
+metadata:
+  name: {{ template "argo-cd.server.fullname" . }}
+  labels:
+    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
+    helm.sh/chart: {{ include "argo-cd.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/part-of: argocd
+    app.kubernetes.io/component: {{ .Values.server.name }}
+{{- with .Values.server.route.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+  host: {{ .Values.server.route.hostname | quote }}
+  subdomain: ''
+  to:
+    kind: Service
+    name: {{ template "argo-cd.server.fullname" . }}
+    weight: 100
+  port:
+    targetPort: https
+  tls:
+    termination: passthrough
+    insecureEdgeTerminationPolicy: None
+  wildcardPolicy: None
+{{- end }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 9cd31ba3..6f962a10 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -304,6 +304,14 @@ server:
       #   hosts:
       #     - argocd.example.com
 
+  # 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
+  # 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: ""
+
   ## ArgoCD config
   ## reference https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/argocd-cm.yaml
   config: