From 56ffd618d6708c4c0c5a0ca1ff017b8e96ec8801 Mon Sep 17 00:00:00 2001
From: Stefan Prodan <stefan.prodan@gmail.com>
Date: Thu, 15 Nov 2018 10:38:20 +0200
Subject: [PATCH] Increase flagger probes timeout to 5s (containerd fix)

---
 artifacts/canaries/deployment.yaml       | 6 ------
 artifacts/flagger/deployment.yaml        | 2 ++
 charts/flagger/templates/deployment.yaml | 6 ++++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/artifacts/canaries/deployment.yaml b/artifacts/canaries/deployment.yaml
index 9511c085..7ace897f 100644
--- a/artifacts/canaries/deployment.yaml
+++ b/artifacts/canaries/deployment.yaml
@@ -45,9 +45,6 @@ spec:
             - http
             - localhost:9898/healthz
           initialDelaySeconds: 5
-          failureThreshold: 3
-          periodSeconds: 10
-          successThreshold: 1
           timeoutSeconds: 5
         readinessProbe:
           exec:
@@ -57,9 +54,6 @@ spec:
             - http
             - localhost:9898/readyz
           initialDelaySeconds: 5
-          failureThreshold: 3
-          periodSeconds: 3
-          successThreshold: 1
           timeoutSeconds: 5
         resources:
           limits:
diff --git a/artifacts/flagger/deployment.yaml b/artifacts/flagger/deployment.yaml
index 4483191c..9f901871 100644
--- a/artifacts/flagger/deployment.yaml
+++ b/artifacts/flagger/deployment.yaml
@@ -41,6 +41,7 @@ spec:
             - --timeout=2
             - --spider
             - http://localhost:8080/healthz
+          timeoutSeconds: 5
         readinessProbe:
           exec:
             command:
@@ -50,6 +51,7 @@ spec:
             - --timeout=2
             - --spider
             - http://localhost:8080/healthz
+          timeoutSeconds: 5
         resources:
           limits:
             memory: "512Mi"
diff --git a/charts/flagger/templates/deployment.yaml b/charts/flagger/templates/deployment.yaml
index 0ec19ce6..4d9a09e2 100644
--- a/charts/flagger/templates/deployment.yaml
+++ b/charts/flagger/templates/deployment.yaml
@@ -43,18 +43,20 @@ spec:
               - wget
               - --quiet
               - --tries=1
-              - --timeout=2
+              - --timeout=4
               - --spider
               - http://localhost:8080/healthz
+            timeoutSeconds: 5
           readinessProbe:
             exec:
               command:
               - wget
               - --quiet
               - --tries=1
-              - --timeout=2
+              - --timeout=4
               - --spider
               - http://localhost:8080/healthz
+            timeoutSeconds: 5
           resources:
 {{ toYaml .Values.resources | indent 12 }}
     {{- with .Values.nodeSelector }}