From c88221ee41bfe6b460694b74241c4bda30cde480 Mon Sep 17 00:00:00 2001
From: MengxinLiu <mengxin@alauda.io>
Date: Mon, 10 Feb 2020 21:01:10 +0800
Subject: [PATCH] fix: disable ovn-nb inactivity_probe

The ovn-nbctl daemon in kube-ovn-controller need to keep a long connection, the default inactivity_probe will drop the connection.
---
 dist/images/start-db.sh  | 1 +
 yamls/kube-ovn-ipv6.yaml | 2 +-
 yamls/kube-ovn.yaml      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dist/images/start-db.sh b/dist/images/start-db.sh
index 0a7095d48ad..12e6d30edf2 100755
--- a/dist/images/start-db.sh
+++ b/dist/images/start-db.sh
@@ -44,6 +44,7 @@ trap quit EXIT
 if [[ -z "$NODE_IPS" ]]; then
     /usr/share/openvswitch/scripts/ovn-ctl restart_northd
     ovn-nbctl set-connection ptcp:"${DB_NB_PORT}":["${DB_NB_ADDR}"]
+    ovn-nbctl set Connection . inactivity_probe=0
     ovn-sbctl set-connection ptcp:"${DB_SB_PORT}":["${DB_SB_ADDR}"]
     ovn-sbctl set Connection . inactivity_probe=0
 else
diff --git a/yamls/kube-ovn-ipv6.yaml b/yamls/kube-ovn-ipv6.yaml
index fe7eef7a044..435e321d4a7 100644
--- a/yamls/kube-ovn-ipv6.yaml
+++ b/yamls/kube-ovn-ipv6.yaml
@@ -74,7 +74,7 @@ spec:
                 - -w3
                 - 127.0.0.1
                 - "10660"
-            initialDelaySeconds: 30
+            initialDelaySeconds: 300
             periodSeconds: 7
             failureThreshold: 5
       nodeSelector:
diff --git a/yamls/kube-ovn.yaml b/yamls/kube-ovn.yaml
index 073bda03a97..779d0124d58 100644
--- a/yamls/kube-ovn.yaml
+++ b/yamls/kube-ovn.yaml
@@ -71,7 +71,7 @@ spec:
               command:
                 - sh
                 - /kube-ovn/kube-ovn-controller-healthcheck.sh
-            initialDelaySeconds: 30
+            initialDelaySeconds: 300
             periodSeconds: 7
             failureThreshold: 5
       nodeSelector: