Skip to content

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

Merged
openshift-merge-bot[bot] merged 14 commits intoopenshift:release-4.20from
ricky-rav:OCPBUGS-59657_420
Oct 8, 2025
Merged

OCPBUGS-61453: [4.20] allow default network -> localnet on the same node for any localnet subnet#2751
openshift-merge-bot[bot] merged 14 commits intoopenshift:release-4.20from
ricky-rav:OCPBUGS-59657_420

Conversation

@ricky-rav
Copy link
Contributor

@ricky-rav ricky-rav commented Sep 9, 2025

No conflicts.
Upstream: ovn-kubernetes/ovn-kubernetes#5480
Downstream master: #2750

trozet and others added 14 commits September 9, 2025 16:32
Fixes regression from 1448d5a

The previous commit dropped matching on in_port so that localnet ports
would also use table 1. This allows reply packets from a localnet pod
towards the shared OVN/LOCAL IP to be sent to the correct port.

However, a regression was introduced where traffic coming from these
localnet ports to any destination would be sent to table 1. Egress
traffic from the localnet ports is not committed to conntrack, so by
sending to table=1 via CT we were getting a miss.

This is especially bad for hardware offload where a localnet port is
being used as the Geneve encap port. In this case all geneve traffic
misses in CT lookup and is not offloaded.

Table 1 is intended to be for handling IP traffic destined to the shared
Gateway IP/MAC that both the Host and OVN use. It is also used to handle
reply traffic for Egress IP. To fix this problem, we can add dl_dst
match criteria to this flow, ensuring that only traffic destined to the
Host/OVN goes to table 1.

Furthermore, after fixing this problem there still exists the issue that
localnet -> host/OVN egress traffic will still enter table 1 and CT
miss. Potentially this can be fixed with always committing egress
traffic, but it might have performance penalty, so deferring that fix to
a later date.

Signed-off-by: Tim Rozet <trozet@nvidia.com>
(cherry picked from commit 318f8ce)
We did this for IPv4 in 1448d5a, but forgot about IPv6.

Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
(cherry picked from commit 66d8f14)
Add dl_dst=$breth0 to table=0, prio=50 for IPv6

We want to match in table=1 only conntrack'ed reply traffic whose next hop is either OVN or the host. As a consequence, localnet traffic whose next hop is an external router (and that might or might not be destined to OVN/host) should bypass table=1 and just hit the NORMAL flow in table=0.

Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
(cherry picked from commit ef1aa99)
Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
(cherry picked from commit 4ce92a9)
We already tested localnet -> host, let's also cover connections initiated from the host.
The localnet uses IPs in the same subnet as the host network.

Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
(cherry picked from commit a5029f8)
We have two non-InterConnect CI lanes for multihoming, while only one with IC enabled (and local gw). We need coverage with IC enabled for both gateway modes, so let's make an existing non-IC lane IC enabled, set it as dualstack and gateway=shared to have better coverage.

Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
(cherry picked from commit bf6f9c1)
Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
(cherry picked from commit 6de44ef)
Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
(cherry picked from commit c4cc25a)
This is needed because we will need to generate IPs from different subnets than just the host subnet.

Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
(cherry picked from commit eb5f3c1)
Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
(cherry picked from commit f82e101)
The localnet is on a subnet different than the host subnet, the corresponding NAD is configured with a VLAN ID, the localnet pod uses an external router to communicate to cluster pods.

Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
(cherry picked from commit 69ec569)
Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
(cherry picked from commit 51eae7a)
Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
(cherry picked from commit dea42b4)
In testing we saw how an invalid conntrack state would drop all echo requests after the first one. Let's send three pings in each test then.

Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
(cherry picked from commit b004ed0)
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Sep 9, 2025
@openshift-ci-robot
Copy link
Contributor

@ricky-rav: This pull request references Jira Issue OCPBUGS-61453, which is invalid:

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Upstream: ovn-kubernetes/ovn-kubernetes#5480
Downstream master: #2750

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@ricky-rav ricky-rav changed the title OCPBUGS-61453: allow default network -> localnet on the same node for any localnet subnet OCPBUGS-61453: [4.20] allow default network -> localnet on the same node for any localnet subnet Sep 9, 2025
@ricky-rav
Copy link
Contributor Author

/retest

@ricky-rav
Copy link
Contributor Author

/test e2e-aws-ovn-shared-to-local-gateway-mode-migration
/test e2e-azure-ovn-upgrade
/test e2e-gcp-ovn
/test e2e-gcp-ovn-techpreview

@ricky-rav
Copy link
Contributor Author

/retest

1 similar comment
@ricky-rav
Copy link
Contributor Author

/retest

@ricky-rav
Copy link
Contributor Author

/retest
/payload-aggregate periodic-ci-openshift-release-master-ci-4.20-e2e-gcp-ovn-upgrade 5
/payload-aggregate periodic-ci-openshift-release-master-ci-4.20-upgrade-from-stable-4.19-e2e-gcp-ovn-rt-upgrade 5
/payload-aggregate periodic-ci-openshift-release-master-ci-4.20-e2e-aws-ovn-techpreview 5

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 26, 2025

@ricky-rav: trigger 3 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-ci-4.20-e2e-gcp-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.20-upgrade-from-stable-4.19-e2e-gcp-ovn-rt-upgrade
  • periodic-ci-openshift-release-master-ci-4.20-e2e-aws-ovn-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/87fdc3e0-9aad-11f0-894f-cbede543393a-0

@ricky-rav
Copy link
Contributor Author

/retest

@ricky-rav
Copy link
Contributor Author

/retest
/payload-aggregate periodic-ci-openshift-release-master-ci-4.20-e2e-gcp-ovn-upgrade 5
/payload-aggregate periodic-ci-openshift-release-master-ci-4.20-upgrade-from-stable-4.19-e2e-gcp-ovn-rt-upgrade 5
/payload-aggregate periodic-ci-openshift-release-master-ci-4.20-e2e-aws-ovn-techpreview 5

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 2, 2025
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 74b1c90 and 2 for PR HEAD 5611e7b in total

@asood-rh
Copy link
Contributor

asood-rh commented Oct 2, 2025

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Oct 2, 2025
@ricky-rav
Copy link
Contributor Author

/retest-required

1 similar comment
@ricky-rav
Copy link
Contributor Author

/retest-required

@knobunc
Copy link
Contributor

knobunc commented Oct 6, 2025

/label staff-eng-approved

@openshift-ci openshift-ci bot added the staff-eng-approved Indicates a release branch PR has been approved by a staff engineer (formerly group/pillar lead). label Oct 6, 2025
@jcaamano
Copy link
Contributor

jcaamano commented Oct 6, 2025

/override ci/prow/lint

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 6, 2025

@jcaamano: Overrode contexts on behalf of jcaamano: ci/prow/lint

Details

In response to this:

/override ci/prow/lint

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@ricky-rav
Copy link
Contributor Author

/retest-required

5 similar comments
@ricky-rav
Copy link
Contributor Author

/retest-required

@ricky-rav
Copy link
Contributor Author

/retest-required

@ricky-rav
Copy link
Contributor Author

/retest-required

@ricky-rav
Copy link
Contributor Author

/retest-required

@ricky-rav
Copy link
Contributor Author

/retest-required

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 7b3e4fb and 1 for PR HEAD 5611e7b in total

@ricky-rav
Copy link
Contributor Author

/retest-required

@tssurya
Copy link
Contributor

tssurya commented Oct 8, 2025

/override ci/prow/lint

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 8, 2025

@tssurya: Overrode contexts on behalf of tssurya: ci/prow/lint

Details

In response to this:

/override ci/prow/lint

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@ricky-rav
Copy link
Contributor Author

/retest-required

@sdodson
Copy link
Member

sdodson commented Oct 8, 2025

/override ci/prow/e2e-gcp-ovn-techpreview
This has passed on a previous run

@sdodson
Copy link
Member

sdodson commented Oct 8, 2025

/skip

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 8, 2025

@sdodson: Overrode contexts on behalf of sdodson: ci/prow/e2e-gcp-ovn-techpreview

Details

In response to this:

/override ci/prow/e2e-gcp-ovn-techpreview
This has passed on a previous run

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-merge-bot openshift-merge-bot bot merged commit 92bb5ee into openshift:release-4.20 Oct 8, 2025
44 checks passed
@openshift-ci-robot
Copy link
Contributor

@ricky-rav: Jira Issue Verification Checks: Jira Issue OCPBUGS-61453
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-61453 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

No conflicts.
Upstream: ovn-kubernetes/ovn-kubernetes#5480
Downstream master: #2750

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 8, 2025

@ricky-rav: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-aws-ovn-hypershift-conformance-techpreview 5611e7b link false /test e2e-aws-ovn-hypershift-conformance-techpreview
ci/prow/e2e-aws-ovn-hypershift-kubevirt 5611e7b link false /test e2e-aws-ovn-hypershift-kubevirt
ci/prow/security 5611e7b link false /test security
ci/prow/lint 5611e7b link true /test lint

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.20.0-0.nightly-2025-10-08-230110

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. staff-eng-approved Indicates a release branch PR has been approved by a staff engineer (formerly group/pillar lead). verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.