Merge pull request #1196 from A-Zee029/health-check

add healthcheck cmd to probe live and ready

Author: oilbeater

cmd/cmdmain.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"github.com/kubeovn/kube-ovn/cmd/controller_health_check"
 	"os"
 	"strings"
 
@@ -15,12 +16,13 @@ import (
 )
 
 const (
-	CmdController = "kube-ovn-controller"
-	CmdDaemon     = "kube-ovn-daemon"
-	CmdMonitor    = "kube-ovn-monitor"
-	CmdPinger     = "kube-ovn-pinger"
-	CmdSpeaker    = "kube-ovn-speaker"
-	CmdWebHook    = "kube-ovn-webhook"
+	CmdController            = "kube-ovn-controller"
+	CmdDaemon                = "kube-ovn-daemon"
+	CmdMonitor               = "kube-ovn-monitor"
+	CmdPinger                = "kube-ovn-pinger"
+	CmdSpeaker               = "kube-ovn-speaker"
+	CmdWebHook               = "kube-ovn-webhook"
+	CmdControllerHealthCheck = "kube-ovn-controller-healthcheck"
 )
 
 func main() {
@@ -39,6 +41,8 @@ func main() {
 		speaker.CmdMain()
 	case CmdWebHook:
 		webhook.CmdMain()
+	case CmdControllerHealthCheck:
+		controller_health_check.CmdMain()
 	default:
 		klog.Fatalf("%s is an unknown command", cmd)
 	}

cmd/controller_health_check/controller_health_check.go

@@ -0,0 +1,33 @@
+package controller_health_check
+
+import (
+	"fmt"
+	"github.com/kubeovn/kube-ovn/pkg/ovs"
+	"k8s.io/klog/v2"
+	"net"
+	"os"
+	"strings"
+	"time"
+)
+
+func CmdMain() {
+	content, err := os.ReadFile("/var/run/ovn/ovn-nbctl.pid")
+	if err != nil {
+		klog.Fatalf("failed to get ovn-nbctl daemon pid, %s", err)
+	}
+	daemonPid := strings.TrimSuffix(string(content), "\n")
+	if err := os.Setenv("OVN_NB_DAEMON", fmt.Sprintf("/var/run/ovn/ovn-nbctl.%s.ctl", daemonPid)); err != nil {
+		klog.Fatalf("failed to set env OVN_NB_DAEMON, %v", err)
+	}
+	if err := ovs.CheckAlive(); err != nil {
+		os.Exit(1)
+	}
+	conn, err := net.DialTimeout("tcp", "127.0.0.1:10660", 3*time.Second)
+	if err != nil {
+		klog.Fatalf("failed to probe the socket, %s", err)
+	}
+	err = conn.Close()
+	if err != nil {
+		klog.Fatalf("Unexpected error closing TCP probe socket: %v (%#v)", err, err)
+	}
+}

dist/images/Dockerfile

@@ -15,4 +15,5 @@ RUN ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-controller && \
     ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-monitor && \
     ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-pinger && \
     ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-speaker && \
-    ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-webhook
+    ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-webhook && \
+    ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-controller-healthcheck

dist/images/install.sh

@@ -1921,15 +1921,13 @@ spec:
           readinessProbe:
             exec:
               command:
-                - bash
-                - /kube-ovn/kube-ovn-controller-healthcheck.sh
+                - /kube-ovn/kube-ovn-controller-healthcheck
             periodSeconds: 3
             timeoutSeconds: 45
           livenessProbe:
             exec:
               command:
-                - bash
-                - /kube-ovn/kube-ovn-controller-healthcheck.sh
+                - /kube-ovn/kube-ovn-controller-healthcheck
             initialDelaySeconds: 300
             periodSeconds: 7
             failureThreshold: 5

dist/images/kube-ovn-controller-healthcheck.sh

@@ -78,15 +78,13 @@ spec:
           readinessProbe:
             exec:
               command:
-                - bash
-                - /kube-ovn/kube-ovn-controller-healthcheck.sh
+                - /kube-ovn/kube-ovn-controller-healthcheck
             periodSeconds: 3
             timeoutSeconds: 45
           livenessProbe:
             exec:
               command:
-                - bash
-                - /kube-ovn/kube-ovn-controller-healthcheck.sh
+                - /kube-ovn/kube-ovn-controller-healthcheck
             initialDelaySeconds: 300
             periodSeconds: 7
             failureThreshold: 5

yamls/kube-ovn-ipv6.yaml

@@ -80,15 +80,13 @@ spec:
           readinessProbe:
             exec:
               command:
-                - bash
-                - /kube-ovn/kube-ovn-controller-healthcheck.sh
+                - /kube-ovn/kube-ovn-controller-healthcheck
             periodSeconds: 3
             timeoutSeconds: 45
           livenessProbe:
             exec:
               command:
-                - bash
-                - /kube-ovn/kube-ovn-controller-healthcheck.sh
+                - /kube-ovn/kube-ovn-controller-healthcheck
             initialDelaySeconds: 300
             periodSeconds: 7
             failureThreshold: 5