kubectl-ko: fix trace when u2oInterconnection is enabled (#2836)

kubeovn · May 24, 2023 · 2068d87 · 2068d87
1 parent 6ee56d0
commit 2068d87
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/dist/images/kubectl-ko b/dist/images/kubectl-ko
@@ -301,7 +301,8 @@ trace(){
 
       local vlan=$(kubectl get subnet "$ls" -o jsonpath={.spec.vlan})
       local logicalGateway=$(kubectl get subnet "$ls" -o jsonpath={.spec.logicalGateway})
-      if [ ! -z "$vlan" -a "$logicalGateway" != "true" ]; then
+      local u2oIC=$(kubectl get subnet "$ls" -o jsonpath={.spec.u2oInterconnection})
+      if [ ! -z "$vlan" -a "$logicalGateway" != "true" -a "$u2oIC" != "true" ]; then
         gateway=$(kubectl get subnet "$ls" -o jsonpath={.spec.gateway})
         if [[ "$gateway" =~ .*,.* ]]; then
           if [ "$af" = "4" ]; then
@@ -358,12 +359,12 @@ trace(){
     fi
 
     if [ -z "$dstMac" ]; then
-      echo "Using the gateway mac address as destination"
+      echo "Using the logical gateway mac address as destination"
       local lr=$(kubectl get "$typedName" $optNamespace -o jsonpath={.metadata.annotations.ovn\\.kubernetes\\.io/logical_router})
       if [ -z "$lr" ]; then
         lr=$(kubectl get subnet "$ls" -o jsonpath={.spec.vpc})
       fi
-      dstMac=$(kubectl exec $OVN_NB_POD -n $KUBE_OVN_NS -c ovn-central -- ovn-nbctl --data=bare --no-heading --columns=mac find logical_router_port name="$lr"-"$ls" | tr -d '\r')
+      dstMac=$(kubectl exec $OVN_NB_POD -n $KUBE_OVN_NS -c ovn-central -- ovn-nbctl --data=bare --no-heading --columns=mac find logical_router_port name="$lr-$ls" | tr -d '\r')
     fi
 
     if [ -z "$dstMac" ]; then