Merge pull request #5114 from cathy-zhou/vf-gateway-fix

detect VF accelerated gateway interface without explicit configuration

Author: girishmg

go-controller/pkg/node/gateway.go

@@ -625,19 +625,24 @@ func bridgeForInterface(intfName, nodeName,
 		if err != nil {
 			return nil, fmt.Errorf("gateway accelerated interface %s is not valid: %w", config.Gateway.GatewayAcceleratedInterface, err)
 		}
+		gwIntf = config.Gateway.GatewayAcceleratedInterface
 		isGWAcclInterface = true
 		klog.Infof("For gateway accelerated interface %s representor: %s", config.Gateway.GatewayAcceleratedInterface, intfRep)
+	} else {
+		intfRep, err = getRepresentor(gwIntf)
+		if err == nil {
+			isGWAcclInterface = true
+		}
 	}
 
 	if isGWAcclInterface {
-		gatewayAcceleratedInterface := config.Gateway.GatewayAcceleratedInterface
 		bridgeName, _, err := util.RunOVSVsctl("port-to-br", intfRep)
 		if err != nil {
 			return nil, fmt.Errorf("failed to find bridge that has port %s: %w", intfRep, err)
 		}
-		link, err := util.GetNetLinkOps().LinkByName(gatewayAcceleratedInterface)
+		link, err := util.GetNetLinkOps().LinkByName(gwIntf)
 		if err != nil {
-			return nil, fmt.Errorf("failed to get netdevice link for %s: %w", gatewayAcceleratedInterface, err)
+			return nil, fmt.Errorf("failed to get netdevice link for %s: %w", gwIntf, err)
 		}
 		uplinkName, err := util.GetNicName(bridgeName)
 		if err != nil {
@@ -646,7 +651,7 @@ func bridgeForInterface(intfName, nodeName,
 		res.bridgeName = bridgeName
 		res.uplinkName = uplinkName
 		res.gwIfaceRep = intfRep
-		res.gwIface = gatewayAcceleratedInterface
+		res.gwIface = gwIntf
 		res.macAddress = link.Attrs().HardwareAddr
 	} else if bridgeName, _, err := util.RunOVSVsctl("port-to-br", intfName); err == nil {
 		// This is an OVS bridge's internal port