fix: ovn restart issues

kubeovn · Mar 28, 2019 · e04bc09 · e04bc09
1 parent 014f1dc
commit e04bc09
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/dist/images/Dockerfile.node b/dist/images/Dockerfile.node
@@ -24,6 +24,7 @@ RUN mkdir -p /var/run/openvswitch && \
     mkdir -p /etc/cni/net.d && \
     mkdir -p /opt/cni/bin
 
+COPY ovn-healthcheck.sh /root/ovn-healthcheck.sh
 COPY start-ovs.sh /root/start-ovs.sh
 COPY start-ovn.sh /root/start-ovn.sh
 

diff --git a/dist/images/ovn-healthcheck.sh b/dist/images/ovn-healthcheck.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -euo pipefail
+
+ovn-nbctl show
+ovn-sbctl show
diff --git a/dist/images/start-ovn.sh b/dist/images/start-ovn.sh
@@ -11,7 +11,7 @@ function quit {
     /usr/share/openvswitch/scripts/ovn-ctl stop_northd
     exit 0
 }
-trap quit SIGTERM
+trap quit EXIT
 
 # Start ovn-northd, ovn-nb and ovn-sb
 /usr/share/openvswitch/scripts/ovn-ctl restart_northd

diff --git a/dist/images/start-ovs.sh b/dist/images/start-ovs.sh
@@ -25,7 +25,7 @@ function quit {
 	/usr/share/openvswitch/scripts/ovn-ctl stop_controller_vtep
 	exit 0
 }
-trap quit SIGTERM
+trap quit EXIT
 
 # Start vswitchd
 /usr/share/openvswitch/scripts/ovs-ctl restart --no-ovs-vswitchd --system-id=random
@@ -51,5 +51,4 @@ ovs-vsctl set open . external-ids:ovn-remote=tcp:${OVN_SB_SERVICE_HOST}:${OVN_SB
 ovs-vsctl set open . external-ids:ovn-encap-type=geneve
 ovs-vsctl set open . external-ids:ovn-encap-ip=${POD_IP}
 
-
 tail -f /var/log/openvswitch/ovs-vswitchd.log
diff --git a/dist/yaml/ovn.yaml b/dist/yaml/ovn.yaml
@@ -184,14 +184,14 @@ spec:
           readinessProbe:
             exec:
               command:
-                - ovn-nbctl
-                - show
+                - sh
+                - /root/ovn-healthcheck.sh
             periodSeconds: 5
           livenessProbe:
             exec:
               command:
-                - ovn-nbctl
-                - show
+              - sh
+              - /root/ovn-healthcheck.sh
             initialDelaySeconds: 10
             periodSeconds: 5
             failureThreshold: 5