rebase fix

swagatbora90 · swagatbora90 · commit c83c41a25b06 · 2025-08-21T21:10:20.000Z
diff --git a/pkg/netutil/netutil_unix.go b/pkg/netutil/netutil_unix.go
@@ -156,9 +156,9 @@ func (e *CNIEnv) generateCNIPlugins(driver string, name string, ipam map[string]
 		}
 
 		if internal {
-			plugins = []CNIPlugin{bridge, newFirewallPlugin(), newTuningPlugin()}
+			plugins = []CNIPlugin{bridge, newFirewallPlugin(ingressPolicy), newTuningPlugin()}
 		} else {
-			plugins = []CNIPlugin{bridge, newPortMapPlugin(), newFirewallPlugin(), newTuningPlugin()}
+			plugins = []CNIPlugin{bridge, newPortMapPlugin(), newFirewallPlugin(ingressPolicy), newTuningPlugin()}
 		}
 		if name != DefaultNetworkName {
 			ok, err := FirewallPluginGEQVersion(firewallPath, "v1.1.0")

Original file line number	Diff line number	Diff line change
`@@ -156,9 +156,9 @@ func (e *CNIEnv) generateCNIPlugins(driver string, name string, ipam map[string]`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`if internal {`
`159`		`- plugins = []CNIPlugin{bridge, newFirewallPlugin(), newTuningPlugin()}`
	`159`	`+ plugins = []CNIPlugin{bridge, newFirewallPlugin(ingressPolicy), newTuningPlugin()}`
`160`	`160`	`} else {`
`161`		`- plugins = []CNIPlugin{bridge, newPortMapPlugin(), newFirewallPlugin(), newTuningPlugin()}`
	`161`	`+ plugins = []CNIPlugin{bridge, newPortMapPlugin(), newFirewallPlugin(ingressPolicy), newTuningPlugin()}`
`162`	`162`	`}`
`163`	`163`	`if name != DefaultNetworkName {`
`164`	`164`	`ok, err := FirewallPluginGEQVersion(firewallPath, "v1.1.0")`