Fix init node transport interface bug (#2670) (#2677)

1.Fix adding node routes crash bug, which caused by uninitialized DualStackIPs param. 2.Fix ipv4 address and ipv6 address confused bug and return the first ipv4 and ipv6 ips for transport interface. Signed-off-by: Wu zhengdong <[email protected]> Co-authored-by: Wu zhengdong <[email protected]>
antrea-io · Aug 31, 2021 · 93d2d64 · 93d2d64
1 parent 7b49d9a
commit 93d2d64
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pkg/agent/controller/noderoute/node_route_controller.go b/pkg/agent/controller/noderoute/node_route_controller.go
@@ -739,7 +739,7 @@ func getNodeMAC(node *corev1.Node) (net.HardwareAddr, error) {
 }
 
 func (c *Controller) getNodeTransportAddrs(node *corev1.Node) (*utilip.DualStackIPs, error) {
-	var transportAddrs *utilip.DualStackIPs
+	var transportAddrs = new(utilip.DualStackIPs)
 	if c.networkConfig.TransportIface != "" {
 		transportAddrsStr := node.Annotations[types.NodeTransportAddressAnnotationKey]
 		if transportAddrsStr != "" {

diff --git a/pkg/agent/util/net.go b/pkg/agent/util/net.go
@@ -165,9 +165,11 @@ func GetIPNetDeviceByName(ifaceName string) (v4IPNet *net.IPNet, v6IPNet *net.IP
 		if ipNet, ok := addr.(*net.IPNet); ok {
 			if ipNet.IP.IsGlobalUnicast() {
 				if ipNet.IP.To4() != nil {
+					if v4IPNet == nil {
+						v4IPNet = ipNet
+					}
+				} else if v6IPNet == nil {
 					v6IPNet = ipNet
-				} else {
-					v4IPNet = ipNet
 				}
 			}
 		}