From 7e381436f98fdad7b21b607193f8bb8d27c74776 Mon Sep 17 00:00:00 2001
From: Alex Andrews <alias-dev@protonmail.com>
Date: Fri, 25 Jun 2021 07:06:59 +0100
Subject: [PATCH 1/2] fix(argo-cd): fix missing colon in example service
 definitions (#810)

* fix(argo-cd): fix missing colon in example service definitions

Signed-off-by: Alex Andrews <alias-dev@protonmail.com>

* build(argo-cd): Bump chart patch version

Signed-off-by: Alex Andrews <alias-dev@protonmail.com>
---
 charts/argo-cd/Chart.yaml  | 2 +-
 charts/argo-cd/values.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 9bb09636..ac5ca980 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 2.0.3
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 3.6.8
+version: 3.6.9
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 466fc7c3..ad6d1b23 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -567,7 +567,7 @@ server:
       # - path: /*
       #   pathType: Prefix
       #   backend:
-      #     service
+      #     service:
       #       name: ssl-redirect
       #       port:
       #         name: use-annotation
@@ -604,7 +604,7 @@ server:
       # - path: /*
       #   pathType: Prefix
       #   backend:
-      #     service
+      #     service:
       #       name: ssl-redirect
       #       port:
       #         name: use-annotation

From 0180e943ff1a9b676893eeac40d306a71c8e2967 Mon Sep 17 00:00:00 2001
From: Alex Sears <searsaw@users.noreply.github.com>
Date: Fri, 25 Jun 2021 02:15:43 -0400
Subject: [PATCH 2/2] chore(argo-workflows): update workflows version to most
 3.0.7 (#811)

* chore(argo-workflows): update workflows version to most 3.0.7

Signed-off-by: Alex Sears <me@alexsears.com>

* chore(argo-worflows): update controller liveness probe

Signed-off-by: Alex Sears <me@alexsears.com>

* chore(argo-workflows): templatize controller liveness probe

Signed-off-by: Alex Sears <me@alexsears.com>

Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
---
 charts/argo-workflows/Chart.yaml                         | 4 ++--
 .../controller/workflow-controller-deployment.yaml       | 8 ++------
 charts/argo-workflows/values.yaml                        | 9 +++++++++
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/charts/argo-workflows/Chart.yaml b/charts/argo-workflows/Chart.yaml
index fb23a3a8..f3dd5219 100644
--- a/charts/argo-workflows/Chart.yaml
+++ b/charts/argo-workflows/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: argo-workflows
 description: A Helm chart for Argo Workflows
 type: application
-version: 0.2.5
-appVersion: "v3.0.2"
+version: 0.2.6
+appVersion: "v3.0.7"
 icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
 sources:
diff --git a/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml b/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml
index 9f80ea7f..e085b899 100644
--- a/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml
+++ b/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml
@@ -77,12 +77,8 @@ spec:
           ports:
             - name: metrics
               containerPort: {{ .Values.controller.metricsConfig.port }}
-          livenessProbe:
-            httpGet:
-              port: metrics
-              path: {{ .Values.controller.metricsConfig.path }}
-            initialDelaySeconds: 30
-            periodSeconds: 30
+            - containerPort: 6060
+          livenessProbe: {{ .Values.controller.livenessProbe | toYaml | nindent 12 }}
       {{- with .Values.images.pullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/argo-workflows/values.yaml b/charts/argo-workflows/values.yaml
index c6af6902..864c9931 100644
--- a/charts/argo-workflows/values.yaml
+++ b/charts/argo-workflows/values.yaml
@@ -132,6 +132,15 @@ controller:
   # service type `LoadBalancer`
   loadBalancerSourceRanges: []
   resources: {}
+  livenessProbe:
+    httpGet:
+      port: 6060
+      path: /healthz
+    # Require three failures to tolerate transient errors.
+    failureThreshold: 3
+    initialDelaySeconds: 90
+    periodSeconds: 60
+    timeoutSeconds: 30
 
   ## Extra environment variables to provide to the controller container
   ## extraEnv: