fix: ko use external-ids to find related nic

kubeovn · Aug 6, 2020 · a98ec5b · a98ec5b
1 parent 9be5488
commit a98ec5b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 28 deletions.
diff --git a/dist/images/install-pre-1.16.sh b/dist/images/install-pre-1.16.sh
@@ -1302,7 +1302,6 @@ tcpdump(){
     hostNetwork=$(kubectl get pod "$podName" -o jsonpath={.spec.hostNetwork})
   else
     nodeName=$(kubectl get pod "$podName" -n "$namespace" -o jsonpath={.spec.nodeName})
-    mac=$(kubectl get pod "$podName" -n "$namespace" -o jsonpath={.metadata.annotations.ovn\\.kubernetes\\.io/mac_address})
     hostNetwork=$(kubectl get pod "$podName" -n "$namespace" -o jsonpath={.spec.hostNetwork})
   fi
 
@@ -1311,12 +1310,6 @@ tcpdump(){
     exit 1
   fi
 
-  if [ -z "$mac" ] && [ "$hostNetwork" != "true" ]; then
-     echo "pod mac address not ready"
-     exit 1
-  fi
-  mac=$(echo "$mac" | tr '[:upper:]' '[:lower:]')
-
   ovnCni=$(kubectl get pod -n $KUBE_OVN_NS -o wide| grep kube-ovn-cni| grep " $nodeName " | awk '{print $1}')
   if [ -z "$ovnCni" ]; then
     echo "kube-ovn-cni not exist on node $nodeName"
@@ -1327,7 +1320,7 @@ tcpdump(){
     set -x
     kubectl exec -it "$ovnCni" -n $KUBE_OVN_NS -- tcpdump -nn "$@"
   else
-    nicName=$(kubectl exec -it "$ovnCni" -n $KUBE_OVN_NS -- ovs-vsctl --data=bare --no-heading --columns=name find interface mac_in_use="${mac//:/\\:}" | tr -d '\r')
+    nicName=$(kubectl exec -it "$ovnCni" -n $KUBE_OVN_NS -- ovs-vsctl --data=bare --no-heading --columns=name find interface external-ids:iface-id="$podName"."$namespace" | tr -d '\r')
     if [ -z "$nicName" ]; then
       echo "nic doesn't exist on node $nodeName"
       exit 1
@@ -1430,7 +1423,7 @@ vsctl(){
   if [ -z "$ovsPod" ]; then
       echo "ovs pod  doesn't exist on node $nodeName"
       exit 1
-    fi
+  fi
   kubectl exec "$ovsPod" -n $KUBE_OVN_NS -- ovs-vsctl "$@"
 }
 
@@ -1446,7 +1439,6 @@ diagnose(){
   checkDaemonSet kube-ovn-cni
   checkDaemonSet ovs-ovn
   checkDeployment coredns
-
   type="$1"
   case $type in
     all)

diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -1432,7 +1432,6 @@ tcpdump(){
     hostNetwork=$(kubectl get pod "$podName" -o jsonpath={.spec.hostNetwork})
   else
     nodeName=$(kubectl get pod "$podName" -n "$namespace" -o jsonpath={.spec.nodeName})
-    mac=$(kubectl get pod "$podName" -n "$namespace" -o jsonpath={.metadata.annotations.ovn\\.kubernetes\\.io/mac_address})
     hostNetwork=$(kubectl get pod "$podName" -n "$namespace" -o jsonpath={.spec.hostNetwork})
   fi
 
@@ -1441,12 +1440,6 @@ tcpdump(){
     exit 1
   fi
 
-  if [ -z "$mac" ] && [ "$hostNetwork" != "true" ]; then
-     echo "pod mac address not ready"
-     exit 1
-  fi
-  mac=$(echo "$mac" | tr '[:upper:]' '[:lower:]')
-
   ovnCni=$(kubectl get pod -n $KUBE_OVN_NS -o wide| grep kube-ovn-cni| grep " $nodeName " | awk '{print $1}')
   if [ -z "$ovnCni" ]; then
     echo "kube-ovn-cni not exist on node $nodeName"
@@ -1457,7 +1450,7 @@ tcpdump(){
     set -x
     kubectl exec -it "$ovnCni" -n $KUBE_OVN_NS -- tcpdump -nn "$@"
   else
-    nicName=$(kubectl exec -it "$ovnCni" -n $KUBE_OVN_NS -- ovs-vsctl --data=bare --no-heading --columns=name find interface mac_in_use="${mac//:/\\:}" | tr -d '\r')
+    nicName=$(kubectl exec -it "$ovnCni" -n $KUBE_OVN_NS -- ovs-vsctl --data=bare --no-heading --columns=name find interface external-ids:iface-id="$podName"."$namespace" | tr -d '\r')
     if [ -z "$nicName" ]; then
       echo "nic doesn't exist on node $nodeName"
       exit 1
@@ -1560,7 +1553,7 @@ vsctl(){
   if [ -z "$ovsPod" ]; then
       echo "ovs pod  doesn't exist on node $nodeName"
       exit 1
-    fi
+  fi
   kubectl exec "$ovsPod" -n $KUBE_OVN_NS -- ovs-vsctl "$@"
 }
 
@@ -1576,7 +1569,6 @@ diagnose(){
   checkDaemonSet kube-ovn-cni
   checkDaemonSet ovs-ovn
   checkDeployment coredns
-
   type="$1"
   case $type in
     all)

diff --git a/dist/images/kubectl-ko b/dist/images/kubectl-ko
@@ -26,7 +26,6 @@ tcpdump(){
     hostNetwork=$(kubectl get pod "$podName" -o jsonpath={.spec.hostNetwork})
   else
     nodeName=$(kubectl get pod "$podName" -n "$namespace" -o jsonpath={.spec.nodeName})
-    mac=$(kubectl get pod "$podName" -n "$namespace" -o jsonpath={.metadata.annotations.ovn\\.kubernetes\\.io/mac_address})
     hostNetwork=$(kubectl get pod "$podName" -n "$namespace" -o jsonpath={.spec.hostNetwork})
   fi
 
@@ -35,12 +34,6 @@ tcpdump(){
     exit 1
   fi
 
-  if [ -z "$mac" ] && [ "$hostNetwork" != "true" ]; then
-     echo "pod mac address not ready"
-     exit 1
-  fi
-  mac=$(echo "$mac" | tr '[:upper:]' '[:lower:]')
-
   ovnCni=$(kubectl get pod -n $KUBE_OVN_NS -o wide| grep kube-ovn-cni| grep " $nodeName " | awk '{print $1}')
   if [ -z "$ovnCni" ]; then
     echo "kube-ovn-cni not exist on node $nodeName"
@@ -51,7 +44,7 @@ tcpdump(){
     set -x
     kubectl exec -it "$ovnCni" -n $KUBE_OVN_NS -- tcpdump -nn "$@"
   else
-    nicName=$(kubectl exec -it "$ovnCni" -n $KUBE_OVN_NS -- ovs-vsctl --data=bare --no-heading --columns=name find interface mac_in_use="${mac//:/\\:}" | tr -d '\r')
+    nicName=$(kubectl exec -it "$ovnCni" -n $KUBE_OVN_NS -- ovs-vsctl --data=bare --no-heading --columns=name find interface external-ids:iface-id="$podName"."$namespace" | tr -d '\r')
     if [ -z "$nicName" ]; then
       echo "nic doesn't exist on node $nodeName"
       exit 1