Merge pull request #5479 from hareeshpc/fix_fdb_bypassport

fix: GWAcceleratedInterface - use gwInterfaceRep port instead of LOCAL

Author: trozet

go-controller/pkg/node/bridgeconfig/bridgeconfig.go

@@ -236,6 +236,10 @@ func (b *BridgeConfiguration) GetGatewayIface() string {
 	return b.gwIface
 }
 
+func (b *BridgeConfiguration) GetGatewayIfaceRep() string {
+	return b.gwIfaceRep
+}
+
 // UpdateInterfaceIPAddresses sets and returns the bridge's current ips
 func (b *BridgeConfiguration) UpdateInterfaceIPAddresses(node *corev1.Node) ([]*net.IPNet, error) {
 	b.mutex.Lock()

go-controller/pkg/node/gateway.go

@@ -428,8 +428,14 @@ func gatewayInitInternal(nodeName, gwIntf, egressGatewayIntf string, gwNextHops
 		}
 	}
 
-	// Set static FDB entry for LOCAL port
-	if err := util.SetStaticFDBEntry(gatewayBridge.GetBridgeName(), gatewayBridge.GetBridgeName(), gatewayBridge.GetMAC()); err != nil {
+	// Set static FDB entry for sharedGW MAC.
+	// If `GatewayIfaceRep` port is present, use it instead of LOCAL (bridge name).
+	gwport := gatewayBridge.GetBridgeName()                           // Default is LOCAL port for the bridge.
+	if repPort := gatewayBridge.GetGatewayIfaceRep(); repPort != "" { // We have an accelerated switchdev device for GW.
+		gwport = repPort
+	}
+
+	if err := util.SetStaticFDBEntry(gatewayBridge.GetBridgeName(), gwport, gatewayBridge.GetMAC()); err != nil {
 		return nil, nil, err
 	}