fix dualStack network checkgw raise panic (#3392)

Signed-off-by: yuanliu <yuanliu_yewu@cmss.chinamobile.com>
kubeovn · Nov 9, 2023 · 005b92b · 005b92b
1 parent 9f08f4a
commit 005b92b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/pkg/daemon/ovs_linux.go b/pkg/daemon/ovs_linux.go
@@ -362,13 +362,11 @@ func waitNetworkReady(nic, ipAddr, gateway string, underlayGateway, verbose bool
 				klog.Infof("MAC addresses of gateway %s is %s", gw, mac.String())
 				klog.Infof("network %s with gateway %s is ready for interface %s after %d checks", ips[i], gw, nic, count)
 			}
-			maxRetry -= count
 		} else {
-			count, err := pingGateway(gw, src, verbose, maxRetry)
+			_, err := pingGateway(gw, src, verbose, maxRetry)
 			if err != nil {
 				return err
 			}
-			maxRetry -= count
 		}
 	}
 	return nil

diff --git a/pkg/daemon/ovs_windows.go b/pkg/daemon/ovs_windows.go
@@ -242,11 +242,10 @@ func waitNetworkReady(nic, ipAddr, gateway string, underlayGateway, verbose bool
 	for i, gw := range strings.Split(gateway, ",") {
 		src := strings.Split(ips[i], "/")[0]
 		if !underlayGateway || util.CheckProtocol(gw) == kubeovnv1.ProtocolIPv6 {
-			count, err := pingGateway(gw, src, verbose, maxRetry)
+			_, err := pingGateway(gw, src, verbose, maxRetry)
 			if err != nil {
 				return err
 			}
-			maxRetry -= count
 		}
 	}
 	return nil