From c9c2d3c610638056a26ac7b71acc4632ccdd21e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=A5=96=E5=BB=BA?= <zhangzujian.7@gmail.com>
Date: Tue, 13 Aug 2024 16:33:53 +0800
Subject: [PATCH] increase health probe timeout (#4397)

Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
---
 charts/kube-ovn/templates/controller-deploy.yaml |  4 ++--
 charts/kube-ovn/templates/monitor-deploy.yaml    |  4 ++--
 charts/kube-ovn/templates/ovncni-ds.yaml         |  4 ++--
 cmd/health_check/health_check.go                 |  2 +-
 dist/images/install.sh                           | 12 ++++++------
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/charts/kube-ovn/templates/controller-deploy.yaml b/charts/kube-ovn/templates/controller-deploy.yaml
index cbb281e352c..eaa4c3dc5a0 100644
--- a/charts/kube-ovn/templates/controller-deploy.yaml
+++ b/charts/kube-ovn/templates/controller-deploy.yaml
@@ -191,7 +191,7 @@ spec:
                 - --port=10660
                 - --tls={{- .Values.func.SECURE_SERVING }}
             periodSeconds: 3
-            timeoutSeconds: 1
+            timeoutSeconds: 5
           livenessProbe:
             exec:
               command:
@@ -201,7 +201,7 @@ spec:
             initialDelaySeconds: 300
             periodSeconds: 7
             failureThreshold: 5
-            timeoutSeconds: 1
+            timeoutSeconds: 5
           resources:
             requests:
               cpu: {{ index .Values "kube-ovn-controller" "requests" "cpu" }}
diff --git a/charts/kube-ovn/templates/monitor-deploy.yaml b/charts/kube-ovn/templates/monitor-deploy.yaml
index 18c67877c78..0bb2f4d4be7 100644
--- a/charts/kube-ovn/templates/monitor-deploy.yaml
+++ b/charts/kube-ovn/templates/monitor-deploy.yaml
@@ -130,7 +130,7 @@ spec:
                 - /kube-ovn/kube-ovn-healthcheck
                 - --port=10661
                 - --tls={{- .Values.func.SECURE_SERVING }}
-            timeoutSeconds: 1
+            timeoutSeconds: 5
           readinessProbe:
             failureThreshold: 3
             initialDelaySeconds: 30
@@ -141,7 +141,7 @@ spec:
                 - /kube-ovn/kube-ovn-healthcheck
                 - --port=10661
                 - --tls={{- .Values.func.SECURE_SERVING }}
-            timeoutSeconds: 1
+            timeoutSeconds: 5
       nodeSelector:
         kubernetes.io/os: "linux"
         {{- with splitList "=" .Values.MASTER_NODES_LABEL }}
diff --git a/charts/kube-ovn/templates/ovncni-ds.yaml b/charts/kube-ovn/templates/ovncni-ds.yaml
index 2dea7d1f648..aebbbe21b4e 100644
--- a/charts/kube-ovn/templates/ovncni-ds.yaml
+++ b/charts/kube-ovn/templates/ovncni-ds.yaml
@@ -203,7 +203,7 @@ spec:
               - /kube-ovn/kube-ovn-healthcheck
               - --port=10665
               - --tls={{- .Values.func.SECURE_SERVING }}
-          timeoutSeconds: 1
+          timeoutSeconds: 5
         livenessProbe:
           failureThreshold: 3
           initialDelaySeconds: 30
@@ -214,7 +214,7 @@ spec:
               - /kube-ovn/kube-ovn-healthcheck
               - --port=10665
               - --tls={{- .Values.func.SECURE_SERVING }}
-          timeoutSeconds: 1
+          timeoutSeconds: 5
         resources:
           requests:
             cpu: {{ index .Values "kube-ovn-cni" "requests" "cpu" }}
diff --git a/cmd/health_check/health_check.go b/cmd/health_check/health_check.go
index 45e59382768..1017578682c 100644
--- a/cmd/health_check/health_check.go
+++ b/cmd/health_check/health_check.go
@@ -51,7 +51,7 @@ func CmdMain() {
 	} else {
 		addr = "tcp://" + addr
 	}
-	if err := util.DialTCP(addr, 100*time.Millisecond, false); err != nil {
+	if err := util.DialTCP(addr, time.Second, false); err != nil {
 		util.LogFatalAndExit(err, "failed to probe the socket")
 	}
 }
diff --git a/dist/images/install.sh b/dist/images/install.sh
index 0dea9383c45..0334f64e49b 100755
--- a/dist/images/install.sh
+++ b/dist/images/install.sh
@@ -4345,7 +4345,7 @@ spec:
                 - --port=10660
                 - --tls=${SECURE_SERVING}
             periodSeconds: 3
-            timeoutSeconds: 1
+            timeoutSeconds: 5
           livenessProbe:
             exec:
               command:
@@ -4355,7 +4355,7 @@ spec:
             initialDelaySeconds: 300
             periodSeconds: 7
             failureThreshold: 5
-            timeoutSeconds: 1
+            timeoutSeconds: 5
           resources:
             requests:
               cpu: 200m
@@ -4568,7 +4568,7 @@ spec:
               - /kube-ovn/kube-ovn-healthcheck
               - --port=10665
               - --tls=${SECURE_SERVING}
-          timeoutSeconds: 1
+          timeoutSeconds: 5
         readinessProbe:
           failureThreshold: 3
           periodSeconds: 7
@@ -4578,7 +4578,7 @@ spec:
               - /kube-ovn/kube-ovn-healthcheck
               - --port=10665
               - --tls=${SECURE_SERVING}
-          timeoutSeconds: 1
+          timeoutSeconds: 5
         resources:
           requests:
             cpu: 100m
@@ -4909,7 +4909,7 @@ spec:
                 - /kube-ovn/kube-ovn-healthcheck
                 - --port=10661
                 - --tls=${SECURE_SERVING}
-            timeoutSeconds: 1
+            timeoutSeconds: 5
           readinessProbe:
             failureThreshold: 3
             initialDelaySeconds: 30
@@ -4920,7 +4920,7 @@ spec:
                 - /kube-ovn/kube-ovn-healthcheck
                 - --port=10661
                 - --tls=${SECURE_SERVING}
-            timeoutSeconds: 1
+            timeoutSeconds: 5
       nodeSelector:
         kubernetes.io/os: "linux"
         kube-ovn/role: "master"