From feab52817fce2aeba9b274fdef7d127897cedd67 Mon Sep 17 00:00:00 2001
From: Petr Drastil <petr.drastil@gmail.com>
Date: Mon, 23 Aug 2021 18:53:15 +0200
Subject: [PATCH] Add probes for Dex server >= 2.28.0

Signed-off-by: Petr Drastil <petr.drastil@gmail.com>
---
 charts/argo-cd/Chart.yaml                    |  4 ++--
 charts/argo-cd/templates/dex/deployment.yaml |  6 ++++++
 charts/argo-cd/values.yaml                   | 13 +++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 90543f56..15fa92f4 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 2.1.0
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 3.13.1
+version: 3.14.0
 home: https://github.com/argoproj/argo-helm
 icon: https://argoproj.github.io/argo-cd/assets/logo.png
 keywords:
@@ -21,4 +21,4 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Fixed]: Updated README.md for ArgoCD"
+    - "[Added]: Probe configuration for Dex server"
diff --git a/charts/argo-cd/templates/dex/deployment.yaml b/charts/argo-cd/templates/dex/deployment.yaml
index 557140ce..16acb7c5 100755
--- a/charts/argo-cd/templates/dex/deployment.yaml
+++ b/charts/argo-cd/templates/dex/deployment.yaml
@@ -78,6 +78,12 @@ spec:
           containerPort: {{ .Values.dex.containerPortMetrics }}
           protocol: TCP
         {{- end }}
+        {{- if .Values.dex.probes.enabled }}
+        livenessProbe:
+          {{- toYaml .Values.dex.probes.livenessProbe | nindent 10 }}
+        readinessProbe:
+          {{- toYaml .Values.dex.probes.readinessProbe | nindent 10 }}
+        {{- end }}
         volumeMounts:
         - mountPath: /tmp
           name: tmp-dir
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 8e637966..83b9c683 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -259,6 +259,19 @@ dex:
   ##
   podLabels: {}
 
+  ## Probes for Dex server
+  ## Supported from Dex >= 2.28.0
+  probes:
+    enabled: false
+    livenessProbe:
+      httpGet:
+        path: /healthz/live
+        port: 5558
+    readinessProbe:
+      httpGet:
+        path: /healthz/ready
+        port: 5558
+
   serviceAccount:
     create: true
     name: argocd-dex-server