Skip to content

OCPBUGS-61453: [4.20] allow default network -> localnet on the same node for any localnet subnet #2751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 14 commits into from
Oct 8, 2025
Merged

OCPBUGS-61453: [4.20] allow default network -> localnet on the same node for any localnet subnet #2751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d2127e4
Openflow: lookup conntrack & table=1 only when breth0 is next hop
trozet Aug 27, 2025
79ef291
Openflow: drop in_port from IPv6 dispatch OF rule at prio=50
Aug 28, 2025
a7476f2
Openflow: lookup conntrack & table=1 when breth0 is next hop (IPv6)
Aug 28, 2025
1bf08b9
E2E localnet: remove double import of ginkgo
Aug 14, 2025
d50d504
E2E: add test host -> localnet with IP in host subnet
Aug 7, 2025
ca0c713
Configure existing multihoming CI lane as IC-enabled and shared gw
Sep 2, 2025
c317be2
E2E localnet: remove references to downstream bugs and stories
Sep 1, 2025
878d540
E2E localnet: specify that the localnet uses IPs from host subnet
Aug 19, 2025
35faf85
E2E localnet: make IP request for localnet pod extensible
Aug 14, 2025
2118ba6
E2E localnet: Fix requirement on number of schedulable nodes
Aug 19, 2025
51f5fde
E2E localnet: default network->localnet on VLAN with external router
Aug 18, 2025
164d9f8
E2E localnet: host network -> localnet on VLAN with external router
Aug 20, 2025
63bb48f
E2E localnet: localnet -> host network on VLAN with external router
Aug 25, 2025
5611e7b
E2E localnet: send three pings instead of just one
Aug 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ jobs:
- {"target": "control-plane", "ha": "noHA", "gateway-mode": "local", "ipfamily": "ipv6", "disable-snat-multiple-gws": "noSnatGW", "second-bridge": "1br", "ic": "ic-single-node-zones"}
- {"target": "control-plane", "ha": "noHA", "gateway-mode": "shared", "ipfamily": "ipv4", "disable-snat-multiple-gws": "noSnatGW", "second-bridge": "2br", "ic": "ic-single-node-zones"}
- {"target": "control-plane", "ha": "noHA", "gateway-mode": "shared", "ipfamily": "ipv6", "disable-snat-multiple-gws": "noSnatGW", "second-bridge": "2br", "ic": "ic-single-node-zones"}
- {"target": "multi-homing", "ha": "noHA", "gateway-mode": "local", "ipfamily": "ipv4", "disable-snat-multiple-gws": "SnatGW", "second-bridge": "1br", "ic": "ic-disabled"}
- {"target": "multi-homing", "ha": "noHA", "gateway-mode": "shared", "ipfamily": "dualstack", "disable-snat-multiple-gws": "SnatGW", "second-bridge": "1br", "ic": "ic-single-node-zones"}
- {"target": "multi-homing-helm", "ha": "HA", "gateway-mode": "shared", "ipfamily": "ipv4", "disable-snat-multiple-gws": "snatGW", "second-bridge": "1br", "ic": "ic-disabled", "network-segmentation": "enable-network-segmentation"}
- {"target": "node-ip-mac-migration", "ha": "noHA", "gateway-mode": "shared", "ipfamily": "ipv6", "disable-snat-multiple-gws": "SnatGW", "second-bridge": "1br", "ic": "ic-disabled"}
- {"target": "node-ip-mac-migration", "ha": "noHA", "gateway-mode": "shared", "ipfamily": "ipv4", "disable-snat-multiple-gws": "SnatGW", "second-bridge": "1br", "ic": "ic-single-node-zones"}
Expand Down
12 changes: 6 additions & 6 deletions go-controller/pkg/node/bridgeconfig/bridgeflows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,12 +632,12 @@ func (b *BridgeConfiguration) commonFlows(hostSubnets []*net.IPNet) ([]string, e
}

if ofPortPhys != "" {
// table 0, packets coming from external or other localnet ports. Send it through conntrack and
// resubmit to table 1 to know the state and mark of the connection.
// table 0, packets coming from external or other localnet ports and destined to OVN or LOCAL.
// Send it through conntrack and resubmit to table 1 to know the state and mark of the connection.
// Note, there are higher priority rules that take care of traffic coming from LOCAL and OVN ports.
dftFlows = append(dftFlows,
fmt.Sprintf("cookie=%s, priority=50, ip, actions=ct(zone=%d, nat, table=1)",
nodetypes.DefaultOpenFlowCookie, config.Default.ConntrackZone))
fmt.Sprintf("cookie=%s, priority=50, ip, dl_dst=%s, actions=ct(zone=%d, nat, table=1)",
nodetypes.DefaultOpenFlowCookie, bridgeMacAddress, config.Default.ConntrackZone))
}
}

Expand Down Expand Up @@ -733,8 +733,8 @@ func (b *BridgeConfiguration) commonFlows(hostSubnets []*net.IPNet) ([]string, e
// table 0, packets coming from external. Send it through conntrack and
// resubmit to table 1 to know the state and mark of the connection.
dftFlows = append(dftFlows,
fmt.Sprintf("cookie=%s, priority=50, in_port=%s, ipv6, "+
"actions=ct(zone=%d, nat, table=1)", nodetypes.DefaultOpenFlowCookie, ofPortPhys, config.Default.ConntrackZone))
fmt.Sprintf("cookie=%s, priority=50, ipv6, dl_dst=%s, actions=ct(zone=%d, nat, table=1)",
nodetypes.DefaultOpenFlowCookie, bridgeMacAddress, config.Default.ConntrackZone))
}
}
if ofPortPhys != "" {
Expand Down
Loading