From d71446817c63ab573ef7fc359ff90ffd68bef526 Mon Sep 17 00:00:00 2001
From: hzma <hzma@alauda.io>
Date: Thu, 9 Jun 2022 14:23:54 +0800
Subject: [PATCH] update ovs health check, delete connection to ovn sb db
 (#1588)

---
 dist/images/install.sh         | 4 ++--
 dist/images/ovs-healthcheck.sh | 6 +++---
 yamls/kube-ovn-dual-stack.yaml | 4 ++--
 yamls/kube-ovn-ipv6.yaml       | 4 ++--
 yamls/kube-ovn.yaml            | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dist/images/install.sh b/dist/images/install.sh
index 5281a461ee0..de3d6a91086 100755
--- a/dist/images/install.sh
+++ b/dist/images/install.sh
@@ -3010,14 +3010,14 @@ spec:
             exec:
               command:
               - cat
-              - /var/run/ovn/ovnnb_db.pid
+              - /var/run/ovn/ovn-controller.pid
             periodSeconds: 10
             timeoutSeconds: 45
           livenessProbe:
             exec:
               command:
               - cat
-              - /var/run/ovn/ovnnb_db.pid
+              - /var/run/ovn/ovn-controller.pid
             initialDelaySeconds: 30
             periodSeconds: 10
             failureThreshold: 5
diff --git a/dist/images/ovs-healthcheck.sh b/dist/images/ovs-healthcheck.sh
index b600b6f3557..9b0f7aad1ea 100755
--- a/dist/images/ovs-healthcheck.sh
+++ b/dist/images/ovs-healthcheck.sh
@@ -23,11 +23,11 @@ function gen_conn_str {
   echo "$x"
 }
 
-echo Connecting OVN SB "$(gen_conn_str 6642)"
+# echo Connecting OVN SB "$(gen_conn_str 6642)"
 if [[ "$ENABLE_SSL" == "false" ]]; then
-  ovsdb-client list-dbs "$(gen_conn_str 6642)"
+  ovsdb-client list-dbs
 else
-  ovsdb-client -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert list-dbs "$(gen_conn_str 6642)"
+  ovsdb-client -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert list-dbs
 fi
 alias ovs-ctl='/usr/share/openvswitch/scripts/ovs-ctl'
 alias ovn-ctl='/usr/share/ovn/scripts/ovn-ctl'
diff --git a/yamls/kube-ovn-dual-stack.yaml b/yamls/kube-ovn-dual-stack.yaml
index 511dadfe8f5..10c5233ba5b 100644
--- a/yamls/kube-ovn-dual-stack.yaml
+++ b/yamls/kube-ovn-dual-stack.yaml
@@ -443,14 +443,14 @@ spec:
             exec:
               command:
                 - cat
-                - /var/run/ovn/ovnnb_db.pid
+                - /var/run/ovn/ovn-controller.pid
             periodSeconds: 10
             timeoutSeconds: 45
           livenessProbe:
             exec:
               command:
                 - cat
-                - /var/run/ovn/ovnnb_db.pid
+                - /var/run/ovn/ovn-controller.pid
             initialDelaySeconds: 30
             periodSeconds: 10
             failureThreshold: 5
diff --git a/yamls/kube-ovn-ipv6.yaml b/yamls/kube-ovn-ipv6.yaml
index fb958d2021c..ba5979bbd78 100644
--- a/yamls/kube-ovn-ipv6.yaml
+++ b/yamls/kube-ovn-ipv6.yaml
@@ -415,14 +415,14 @@ spec:
             exec:
               command:
                 - cat
-                - /var/run/ovn/ovnnb_db.pid
+                - /var/run/ovn/ovn-controller.pid
             periodSeconds: 10
             timeoutSeconds: 45
           livenessProbe:
             exec:
               command:
                 - cat
-                - /var/run/ovn/ovnnb_db.pid
+                - /var/run/ovn/ovn-controller.pid
             initialDelaySeconds: 30
             periodSeconds: 10
             failureThreshold: 5
diff --git a/yamls/kube-ovn.yaml b/yamls/kube-ovn.yaml
index 202e560856c..89442bd066a 100644
--- a/yamls/kube-ovn.yaml
+++ b/yamls/kube-ovn.yaml
@@ -458,14 +458,14 @@ spec:
             exec:
               command:
                 - cat
-                - /var/run/ovn/ovnnb_db.pid
+                - /var/run/ovn/ovn-controller.pid
             periodSeconds: 10
             timeoutSeconds: 45
           livenessProbe:
             exec:
               command:
                 - cat
-                - /var/run/ovn/ovnnb_db.pid
+                - /var/run/ovn/ovn-controller.pid
             initialDelaySeconds: 30
             periodSeconds: 10
             failureThreshold: 5