Merge pull request #5465 from ricky-rav/prio10flow

trozet · web-flow · commit bd054ab082d0 · 2025-08-08T16:49:25.000-04:00
Restore "Fixes FDB learning" commit after bridge refactoring
diff --git a/go-controller/pkg/node/bridgeconfig/bridgeflows.go b/go-controller/pkg/node/bridgeconfig/bridgeflows.go
@@ -525,7 +525,7 @@ func (b *BridgeConfiguration) commonFlows(hostSubnets []*net.IPNet) ([]string, e
 			actions += "output:" + netConfig.OfPortPatch + ","
 		}
 
-		actions += strip_vlan + "output:" + ofPortHost
+		actions += strip_vlan + "NORMAL"
 		dftFlows = append(dftFlows,
 			fmt.Sprintf("cookie=%s, priority=10, table=0, %s dl_dst=%s, actions=%s",
 				nodetypes.DefaultOpenFlowCookie, match_vlan, bridgeMacAddress, actions))

Original file line number	Diff line number	Diff line change
`@@ -525,7 +525,7 @@ func (b BridgeConfiguration) commonFlows(hostSubnets []net.IPNet) ([]string, e`
`525`	`525`	`actions += "output:" + netConfig.OfPortPatch + ","`
`526`	`526`	`}`
`527`	`527`
`528`		`- actions += strip_vlan + "output:" + ofPortHost`
	`528`	`+ actions += strip_vlan + "NORMAL"`
`529`	`529`	`dftFlows = append(dftFlows,`
`530`	`530`	`fmt.Sprintf("cookie=%s, priority=10, table=0, %s dl_dst=%s, actions=%s",`
`531`	`531`	`nodetypes.DefaultOpenFlowCookie, match_vlan, bridgeMacAddress, actions))`