From b3dad14bd33934c7cc43e0d4fd7b87cde9b7ebc1 Mon Sep 17 00:00:00 2001 From: Petr Drastil Date: Mon, 23 Aug 2021 20:24:52 +0200 Subject: [PATCH] Enable metrics port and allow user to configure only retries Signed-off-by: Petr Drastil --- charts/argo-cd/templates/dex/deployment.yaml | 16 ++++++++++++---- charts/argo-cd/values.yaml | 16 ++++++++++------ 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/charts/argo-cd/templates/dex/deployment.yaml b/charts/argo-cd/templates/dex/deployment.yaml index 16acb7c5..d46e3cd3 100755 --- a/charts/argo-cd/templates/dex/deployment.yaml +++ b/charts/argo-cd/templates/dex/deployment.yaml @@ -73,16 +73,24 @@ spec: - name: grpc containerPort: {{ .Values.dex.containerPortGrpc }} protocol: TCP - {{- if .Values.dex.metrics.enabled }} - name: metrics containerPort: {{ .Values.dex.containerPortMetrics }} protocol: TCP - {{- end }} {{- if .Values.dex.probes.enabled }} livenessProbe: - {{- toYaml .Values.dex.probes.livenessProbe | nindent 10 }} + httpGet: + path: /healthz/live + port: metrics + {{- with .Values.dex.probes.livenessProbe }} + {{- toYaml . | nindent 10 }} + {{- end }} readinessProbe: - {{- toYaml .Values.dex.probes.readinessProbe | nindent 10 }} + httpGet: + path: /healthz/ready + port: metrics + {{- with .Values.dex.probes.readinessProbe }} + {{- toYaml . | nindent 10 }} + {{- end }} {{- end }} volumeMounts: - mountPath: /tmp diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 83b9c683..d5b775ae 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -264,13 +264,17 @@ dex: probes: enabled: false livenessProbe: - httpGet: - path: /healthz/live - port: 5558 + failureThreshold: 3 + initialDelaySeconds: 10 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 1 readinessProbe: - httpGet: - path: /healthz/ready - port: 5558 + failureThreshold: 3 + initialDelaySeconds: 10 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 1 serviceAccount: create: true