fix: kube-proxy check

kubeovn · Feb 9, 2021 · 2dbcb76 · 2dbcb76
1 parent 49dfba9
commit 2dbcb76
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 16 deletions.
diff --git a/dist/images/install-pre-1.16.sh b/dist/images/install-pre-1.16.sh
@@ -2087,14 +2087,6 @@ checkDaemonSet(){
   fi
 }
 
-checkKubeProxy(){
-  healthResult=`kubectl get node -o wide | grep -v "INTERNAL-IP" | awk '{printf "curl -g -6 -sL -w %{http_code} http://[%s]:10256/healthz -o /dev/null | grep -v 200 \n", $6}' | bash` || true
-  if [ -n "$healthResult" ]; then
-    echo "kube-proxy's health check failed"
-    exit 1
-  fi
-}
-
 checkDeployment(){
   name="$1"
   ready=$(kubectl get deployment -n $KUBE_OVN_NS "$name" -o jsonpath={.status.readyReplicas})
@@ -2109,6 +2101,24 @@ checkDeployment(){
   fi
 }
 
+checkKubeProxy(){
+  dsMode=`kubectl get ds -n kube-system | grep kube-proxy || true`
+  if [ -z "$dsMode" ]; then
+    nodeIps=`kubectl get node -o wide | grep -v "INTERNAL-IP" | awk '{print $6}'`
+    for node in $nodeIps
+    do
+      healthResult=`curl -g -6 -sL -w %{http_code} http://[$node]:10256/healthz -o /dev/null | grep -v 200 || true`
+      if [ -n "$healthResult" ]; then
+        echo "$node kube-proxy's health check failed"
+        exit 1
+      fi
+    done
+  else
+    checkDaemonSet kube-proxy
+  fi
+  echo "kube-proxy ready"
+}
+
 if [ $# -lt 1 ]; then
   showHelp
   exit 0

diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -2140,11 +2140,21 @@ checkDeployment(){
 }
 
 checkKubeProxy(){
-  healthResult=`kubectl get node -o wide | grep -v "INTERNAL-IP" | awk '{printf "curl -g -6 -sL -w %{http_code} http://[%s]:10256/healthz -o /dev/null | grep -v 200 \n", $6}' | bash` || true
-  if [ -n "$healthResult" ]; then
-    echo "kube-proxy's health check failed"
-    exit 1
+  dsMode=`kubectl get ds -n kube-system | grep kube-proxy || true`
+  if [ -z "$dsMode" ]; then
+    nodeIps=`kubectl get node -o wide | grep -v "INTERNAL-IP" | awk '{print $6}'`
+    for node in $nodeIps
+    do
+      healthResult=`curl -g -6 -sL -w %{http_code} http://[$node]:10256/healthz -o /dev/null | grep -v 200 || true`
+      if [ -n "$healthResult" ]; then
+        echo "$node kube-proxy's health check failed"
+        exit 1
+      fi
+    done
+  else
+    checkDaemonSet kube-proxy
   fi
+  echo "kube-proxy ready"
 }
 
 if [ $# -lt 1 ]; then

diff --git a/dist/images/kubectl-ko b/dist/images/kubectl-ko
@@ -156,6 +156,7 @@ xxctl(){
 }
 
 diagnose(){
+  kubectl get crd vpcs.kubeovn.io
   kubectl get crd subnets.kubeovn.io
   kubectl get crd ips.kubeovn.io
   kubectl get svc kube-dns -n kube-system
@@ -268,11 +269,21 @@ checkDeployment(){
 }
 
 checkKubeProxy(){
-  healthResult=`kubectl get node -o wide | grep -v "INTERNAL-IP" | awk '{printf "curl -g -6 -sL -w %{http_code} http://[%s]:10256/healthz -o /dev/null | grep -v 200 \n", $6}' | bash` || true
-  if [ -n "$healthResult" ]; then
-    echo "kube-proxy's health check failed"
-    exit 1
+  dsMode=`kubectl get ds -n kube-system | grep kube-proxy || true`
+  if [ -z "$dsMode" ]; then
+    nodeIps=`kubectl get node -o wide | grep -v "INTERNAL-IP" | awk '{print $6}'`
+    for node in $nodeIps
+    do
+      healthResult=`curl -g -6 -sL -w %{http_code} http://[$node]:10256/healthz -o /dev/null | grep -v 200 || true`
+      if [ -n "$healthResult" ]; then
+        echo "$node kube-proxy's health check failed"
+        exit 1
+      fi
+    done
+  else
+    checkDaemonSet kube-proxy
   fi
+  echo "kube-proxy ready"
 }
 
 if [ $# -lt 1 ]; then