From 046635d69b140ec075731a196d9864caf9484232 Mon Sep 17 00:00:00 2001
From: cskh <huikang209@gmail.com>
Date: Tue, 10 Aug 2021 02:39:38 -0400
Subject: [PATCH] fix(argo-rollouts): Add missing liveness and readiness probe
 (#860)

* fix(argo-rollouts): missing liveness and readiness probe

Signed-off-by: Hui Kang <hui.kang@salesforce.com>

* Apply suggestions from code review

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

* Update changelog annotation

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

* Fix icon url

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

Co-authored-by: Hui Kang <hui.kang@salesforce.com>
Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
---
 charts/argo-rollouts/Chart.yaml               |  7 ++++---
 .../templates/argo-rollouts-deployment.yaml   |  4 ++++
 charts/argo-rollouts/values.yaml              | 20 +++++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/charts/argo-rollouts/Chart.yaml b/charts/argo-rollouts/Chart.yaml
index 6f904714..c92e4c62 100644
--- a/charts/argo-rollouts/Chart.yaml
+++ b/charts/argo-rollouts/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 appVersion: "v1.0.2"
 description: A Helm chart for Argo Rollouts
 name: argo-rollouts
-version: 1.0.3
-icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
+version: 1.0.4
+icon: https://argoproj.github.io/argo-rollouts/assets/logo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:
   - name: alexmt
@@ -11,4 +11,5 @@ maintainers:
   - name: jessesuen
 annotations:
   artifacthub.io/changes: |
-    - "[Added]: Initialize Changelog"
+    - "[Fixed]: Add missing liveness and readiness probes"
+    - "[Changed]: Fix icon url"
diff --git a/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml b/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml
index fb632312..4acb0cee 100644
--- a/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml
+++ b/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml
@@ -39,6 +39,10 @@ spec:
         ports:
         - containerPort: 8090
           name: metrics
+        livenessProbe:
+          {{- toYaml .Values.controller.livenessProbe | nindent 10 }}
+        readinessProbe:
+          {{- toYaml .Values.controller.readinessProbe | nindent 10 }}
         securityContext:
           {{- toYaml .Values.containerSecurityContext | nindent 10 }}
         resources:
diff --git a/charts/argo-rollouts/values.yaml b/charts/argo-rollouts/values.yaml
index e778377f..e52e8902 100644
--- a/charts/argo-rollouts/values.yaml
+++ b/charts/argo-rollouts/values.yaml
@@ -31,6 +31,26 @@ controller:
       additionalLabels: {}
       additionalAnnotations: {}
 
+  ## Readiness and liveness probes for rollouts controller
+  livenessProbe:
+    httpGet:
+      path: /metrics
+      port: 8090
+    initialDelaySeconds: 30
+    periodSeconds: 20
+    failureThreshold: 3
+    successThreshold: 1
+    timeoutSeconds: 10
+  readinessProbe:
+    httpGet:
+      path: /metrics
+      port: 8090
+    initialDelaySeconds: 15
+    periodSeconds: 5
+    failureThreshold: 3
+    successThreshold: 1
+    timeoutSeconds: 4
+
 serviceAccount:
   # Specifies whether a service account should be created
   create: true