[SecondaryNetwork] Fix agent crash if host interface is already attached to OVS bridge (antrea-io#6666)

xliuxu · web-flow · commit cb3a00e3326a · 2024-10-12T21:26:29.000+08:00
PrepareHostInterfaceConnection should return the bridged interface name
if the host interface is already attached to the OVS bridge.

Signed-off-by: Xu Liu &lt;xu.liu@broadcom.com&gt;
diff --git a/pkg/agent/util/net_linux.go b/pkg/agent/util/net_linux.go
@@ -419,12 +419,12 @@ func PrepareHostInterfaceConnection(
 	// If the port already exists, just return.
 	if ofPort, err := bridge.GetOFPort(bridgedName, false); err == nil {
 		klog.InfoS("Port already exists, skip the configuration", "port", bridgedName, "ofPort", ofPort)
-		return "", true, nil
+		return bridgedName, true, nil
 	}
 
 	iface, ifaceIPs, ifaceRoutes, err := GetInterfaceConfig(ifaceName)
 	if err != nil {
-		return "", false, nil
+		return "", false, err
 	}
 
 	if err = RenameInterface(ifaceName, bridgedName); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -419,12 +419,12 @@ func PrepareHostInterfaceConnection(`
`419`	`419`	`// If the port already exists, just return.`
`420`	`420`	`if ofPort, err := bridge.GetOFPort(bridgedName, false); err == nil {`
`421`	`421`	`klog.InfoS("Port already exists, skip the configuration", "port", bridgedName, "ofPort", ofPort)`
`422`		`- return "", true, nil`
	`422`	`+ return bridgedName, true, nil`
`423`	`423`	`}`
`424`	`424`
`425`	`425`	`iface, ifaceIPs, ifaceRoutes, err := GetInterfaceConfig(ifaceName)`
`426`	`426`	`if err != nil {`
`427`		`- return "", false, nil`
	`427`	`+ return "", false, err`
`428`	`428`	`}`
`429`	`429`
`430`	`430`	`if err = RenameInterface(ifaceName, bridgedName); err != nil {`