fix d/s merge conflict

jluhrsen · jluhrsen · commit 6222ec8e867c · 2025-08-17T12:07:55.000-07:00
this keeps the OCP HACK and UDN masquerade rules in
the gateway init tests

Signed-off-by: Jamo Luhrsen &lt;jluhrsen@gmail.com&gt;
diff --git a/go-controller/pkg/node/gateway_init_linux_test.go b/go-controller/pkg/node/gateway_init_linux_test.go
@@ -1398,7 +1398,6 @@ OFPT_GET_CONFIG_REPLY (xid=0x4): frags=normal miss_send_len=0`
 				"OVN-KUBE-ITP": []string{},
 			},
 		}
-<<<<<<< HEAD
 		// OCP HACK: Block MCS Access. https://github.com/openshift/ovn-kubernetes/pull/170
 		expectedMCSRules := []string{
 			"-p tcp -m tcp --dport 22624 --syn -j REJECT",
@@ -1417,8 +1416,6 @@ OFPT_GET_CONFIG_REPLY (xid=0x4): frags=normal miss_send_len=0`
 				"-s 169.254.169.0/24 -j MASQUERADE", // this guarantees we SNAT all UDN MasqueradeIPs traffic leaving the node
 			)
 		}
-=======
->>>>>>> upstream/master
 		f4 := iptV4.(*util.FakeIPTables)
 		err = f4.MatchState(expectedTables, map[util.FakePolicyKey]string{{
 			Table: "filter",

Original file line number	Diff line number	Diff line change
@@ -1398,7 +1398,6 @@ OFPT_GET_CONFIG_REPLY (xid=0x4): frags=normal miss_send_len=0`
`1398`	`1398`	`"OVN-KUBE-ITP": []string{},`
`1399`	`1399`	`},`
`1400`	`1400`	`}`
`1401`		`-<<<<<<< HEAD`
`1402`	`1401`	`// OCP HACK: Block MCS Access. https://github.com/openshift/ovn-kubernetes/pull/170`
`1403`	`1402`	`expectedMCSRules := []string{`
`1404`	`1403`	`"-p tcp -m tcp --dport 22624 --syn -j REJECT",`
@@ -1417,8 +1416,6 @@ OFPT_GET_CONFIG_REPLY (xid=0x4): frags=normal miss_send_len=0`
`1417`	`1416`	`"-s 169.254.169.0/24 -j MASQUERADE", // this guarantees we SNAT all UDN MasqueradeIPs traffic leaving the node`
`1418`	`1417`	`)`
`1419`	`1418`	`}`
`1420`		`-=======`
`1421`		`->>>>>>> upstream/master`
`1422`	`1419`	`f4 := iptV4.(*util.FakeIPTables)`
`1423`	`1420`	`err = f4.MatchState(expectedTables, map[util.FakePolicyKey]string{{`
`1424`	`1421`	`Table: "filter",`