From e6babc874b0ab6f43a670f682b56cd4116c4c035 Mon Sep 17 00:00:00 2001
From: Joe McGovern <joseph.mcgovern@workiva.com>
Date: Wed, 2 Dec 2020 10:26:21 -0600
Subject: [PATCH] fix(argo): Use https for readiness probe in secure mode
 (#506)

Signed-off-by: Joseph McGovern <joseph.mcgovern@workiva.com>

Co-authored-by: Stefan Sedich <stefan.sedich@gmail.com>
---
 charts/argo/Chart.yaml                       | 2 +-
 charts/argo/templates/server-deployment.yaml | 7 +++++++
 charts/argo/values.yaml                      | 6 ++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml
index 63fbbdbb..76a5299a 100644
--- a/charts/argo/Chart.yaml
+++ b/charts/argo/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: v2.11.7
 description: A Helm chart for Argo Workflows
 name: argo
-version: 0.13.8
+version: 0.13.10
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:
diff --git a/charts/argo/templates/server-deployment.yaml b/charts/argo/templates/server-deployment.yaml
index bae59607..832fd37d 100644
--- a/charts/argo/templates/server-deployment.yaml
+++ b/charts/argo/templates/server-deployment.yaml
@@ -38,6 +38,9 @@ spec:
           {{- if .Values.server.extraArgs }}
           {{- toYaml .Values.server.extraArgs | nindent 10 }}
           {{- end }}
+          {{- if .Values.server.secure }}
+          - "--secure"
+          {{- end }}
           {{- if .Values.singleNamespace }}
           - "--namespaced"
           {{- end }}
@@ -52,7 +55,11 @@ spec:
             httpGet:
               path: /
               port: 2746
+              {{- if .Values.server.secure }}
+              scheme: HTTPS
+              {{- else }}
               scheme: HTTP
+              {{- end }}
             initialDelaySeconds: 10
             periodSeconds: 20
           env:
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index 5a9a452b..67c9af29 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -201,6 +201,12 @@ server:
   # PriorityClass: system-cluster-critical
   priorityClassName: ""
 
+  # Run the argo server in "secure" mode. Configure this value instead of
+  # "--secure" in extraArgs. See the following documentation for more details
+  # on secure mode:
+  # https://argoproj.github.io/argo/tls/#encrypted
+  secure: false
+
   # Extra arguments to provide to the Argo server binary.
   extraArgs: []