[release-4.18] OCPBUGS-57108: Fix hybrid overlay node subnets collision with cluster subnets #2619

pliurh · 2025-06-05T02:53:30Z

This is a clean cherry-pick for a customer escalation bug.

When hybrid overlay clustersubnets is undefined, the hybrid overlay node subnet allocation is not managed by ovn-k.

But we need to ensures hybrid overlay node subnets are properly marked as allocated in the cluster subnet allocator when they overlap with the cluster subnet ranges, preventing potential subnet allocation conflicts.

The fix helps maintain proper subnet allocation tracking when hybrid overlay nodes use subnets that fall within the cluster's subnet ranges.

(cherry picked from commit 192f575)

📑 Description

Fixes #

Additional Information for reviewers

✅ Checks

My code requires changes to the documentation
if so, I have updated the documentation as required
My code requires tests
if so, I have added and/or updated the tests as required
All the tests have passed in the CI

How to verify it

openshift-ci-robot · 2025-06-05T02:53:35Z

@pliurh: This pull request references Jira Issue OCPBUGS-57106, which is invalid:

release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
expected dependent Jira Issue OCPBUGS-57062 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is New instead
expected dependent Jira Issue OCPBUGS-57062 to target a version in 4.19.0, but it targets "4.19.z" instead

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.

In response to this:

When hybrid overlay clustersubnets is undefined, the hybrid overlay node subnet allocation is not managed by ovn-k.

But we need to ensures hybrid overlay node subnets are properly marked as allocated in the cluster subnet allocator when they overlap with the cluster subnet ranges, preventing potential subnet allocation conflicts.

The fix helps maintain proper subnet allocation tracking when hybrid overlay nodes use subnets that fall within the cluster's subnet ranges.

(cherry picked from commit 192f575) (cherry picked from commit 3b35331)

📑 Description

Fixes #

Additional Information for reviewers

✅ Checks

My code requires changes to the documentation

if so, I have updated the documentation as required

My code requires tests

if so, I have added and/or updated the tests as required

All the tests have passed in the CI

How to verify it

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-robot · 2025-06-05T03:49:19Z

@pliurh: This pull request references Jira Issue OCPBUGS-57108, which is invalid:

expected dependent Jira Issue OCPBUGS-57061 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST instead
expected dependent Jira Issue OCPBUGS-57061 to target a version in 4.19.0, but it targets "4.19.z" instead

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.

In response to this:

This is a clean cherry-pick for a customer escalation bug.

When hybrid overlay clustersubnets is undefined, the hybrid overlay node subnet allocation is not managed by ovn-k.

But we need to ensures hybrid overlay node subnets are properly marked as allocated in the cluster subnet allocator when they overlap with the cluster subnet ranges, preventing potential subnet allocation conflicts.

The fix helps maintain proper subnet allocation tracking when hybrid overlay nodes use subnets that fall within the cluster's subnet ranges.

(cherry picked from commit 192f575) (cherry picked from commit 3b35331)

📑 Description

Fixes #

Additional Information for reviewers

✅ Checks

My code requires changes to the documentation

if so, I have updated the documentation as required

My code requires tests

if so, I have added and/or updated the tests as required

All the tests have passed in the CI

How to verify it

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.

pliurh · 2025-06-18T08:24:21Z

/retest-required

pliurh · 2025-06-18T13:40:36Z

/retest-required

pliurh · 2025-06-18T13:57:53Z

/hold
We will have a 4.19->4.18 sync PR that also contains this change.

pliurh · 2025-06-19T02:51:59Z

/retest-required

zhaozhanqi · 2025-06-19T07:10:37Z

Pre-merge tested this PR and no regression issue

/label qe-approved
/label cherry-pick-approved

openshift-ci-robot · 2025-06-19T07:10:44Z

@pliurh: This pull request references Jira Issue OCPBUGS-57108, which is invalid:

expected dependent Jira Issue OCPBUGS-57061 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ON_QA instead
expected dependent Jira Issue OCPBUGS-57061 to target a version in 4.19.0, but it targets "4.19.z" instead

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.

In response to this:

This is a clean cherry-pick for a customer escalation bug.

When hybrid overlay clustersubnets is undefined, the hybrid overlay node subnet allocation is not managed by ovn-k.

But we need to ensures hybrid overlay node subnets are properly marked as allocated in the cluster subnet allocator when they overlap with the cluster subnet ranges, preventing potential subnet allocation conflicts.

The fix helps maintain proper subnet allocation tracking when hybrid overlay nodes use subnets that fall within the cluster's subnet ranges.

(cherry picked from commit 192f575) (cherry picked from commit 3b35331)

📑 Description

Fixes #

Additional Information for reviewers

✅ Checks

My code requires changes to the documentation

if so, I have updated the documentation as required

My code requires tests

if so, I have added and/or updated the tests as required

All the tests have passed in the CI

How to verify it

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.

zhaozhanqi · 2025-06-19T07:14:27Z

/jira refresh

openshift-ci-robot · 2025-06-19T07:14:32Z

@zhaozhanqi: This pull request references Jira Issue OCPBUGS-57108, which is invalid:

expected dependent Jira Issue OCPBUGS-57061 to target a version in 4.19.0, but it targets "4.19.z" instead

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.

In response to this:

/jira refresh

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.

zhaozhanqi · 2025-06-19T07:19:53Z

/jira refresh

openshift-ci-robot · 2025-06-19T07:20:01Z

@zhaozhanqi: This pull request references Jira Issue OCPBUGS-57108, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.18.z) matches configured target version for branch (4.18.z)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
release note type set to "Release Note Not Required"
dependent bug Jira Issue OCPBUGS-57061 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-57061 targets the "4.19.0" version, which is one of the valid target versions: 4.19.0
bug has dependents

Requesting review from QA contact:
/cc @zhaozhanqi

In response to this:

/jira refresh

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.

pliurh · 2025-06-19T09:14:02Z

/jira refresh

openshift-ci-robot · 2025-06-19T09:14:06Z

@pliurh: This pull request references Jira Issue OCPBUGS-57108, which is valid.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.18.z) matches configured target version for branch (4.18.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
release note type set to "Release Note Not Required"
dependent bug Jira Issue OCPBUGS-57061 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-57061 targets the "4.19.0" version, which is one of the valid target versions: 4.19.0
bug has dependents

Requesting review from QA contact:
/cc @zhaozhanqi

In response to this:

/jira refresh

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.

pliurh · 2025-06-19T09:19:02Z

/unhold

When hybrid overlay clustersubnets is undefined, the hybrid overlay node subnet allocation is not managed by ovn-k. But we need to ensures hybrid overlay node subnets are properly marked as allocated in the cluster subnet allocator when they overlap with the cluster subnet ranges, preventing potential subnet allocation conflicts. The fix helps maintain proper subnet allocation tracking when hybrid overlay nodes use subnets that fall within the cluster's subnet ranges. Signed-off-by: Peng Liu <[email protected]> (cherry picked from commit 192f575)

openshift-ci · 2025-06-19T12:49:36Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcaamano, pliurh

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [jcaamano]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci-robot · 2025-06-19T13:26:19Z

/retest-required

Remaining retests: 0 against base HEAD b5e32a0 and 2 for PR HEAD 13fb9bf in total

jluhrsen · 2025-06-19T17:41:09Z

/retest

pliurh · 2025-06-20T02:06:44Z

/retest-required

zshi-redhat · 2025-06-20T02:56:09Z

/retest-required

zshi-redhat · 2025-06-20T05:42:01Z

/retest-required

pliurh · 2025-06-20T08:55:46Z

/payload-aggregate periodic-ci-openshift-release-master-ci-4.18-e2e-gcp-ovn 3

openshift-ci · 2025-06-20T08:55:50Z

@pliurh: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-master-ci-4.18-e2e-gcp-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/5b812e10-4db4-11f0-8803-45d7f3f7a325-0

deepsm007 · 2025-06-20T15:32:43Z

/retest-required

deepsm007 · 2025-06-20T15:47:37Z

/test e2e-gcp-ovn-techpreview
/test e2e-gcp-ovn

openshift-ci-robot · 2025-06-20T18:49:28Z

/retest-required

Remaining retests: 0 against base HEAD b5e32a0 and 2 for PR HEAD 13fb9bf in total

openshift-ci-robot · 2025-06-20T21:49:28Z

/retest-required

Remaining retests: 0 against base HEAD 6c43dda and 1 for PR HEAD 13fb9bf in total

pliurh · 2025-06-21T13:15:18Z

/retest-required

openshift-ci · 2025-06-21T20:09:20Z

@pliurh: 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/security	`13fb9bf`	link	false	`/test security`
ci/prow/e2e-metal-ipi-ovn-dualstack-bgp-local-gw-techpreview	`13fb9bf`	link	false	`/test e2e-metal-ipi-ovn-dualstack-bgp-local-gw-techpreview`
ci/prow/e2e-aws-ovn-hypershift-kubevirt	`13fb9bf`	link	false	`/test e2e-aws-ovn-hypershift-kubevirt`
ci/prow/e2e-metal-ipi-ovn-dualstack-bgp-techpreview	`13fb9bf`	link	false	`/test e2e-metal-ipi-ovn-dualstack-bgp-techpreview`
ci/prow/openshift-e2e-gcp-ovn-techpreview-upgrade	`13fb9bf`	link	false	`/test openshift-e2e-gcp-ovn-techpreview-upgrade`

Full PR test history. Your PR dashboard.

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.

zshi-redhat · 2025-06-22T13:13:52Z

/retest-required

openshift-ci-robot · 2025-06-22T17:41:31Z

@pliurh: Jira Issue OCPBUGS-57108: All pull requests linked via external trackers have merged:

openshift/ovn-kubernetes#2619

Jira Issue OCPBUGS-57108 has been moved to the MODIFIED state.

In response to this:

This is a clean cherry-pick for a customer escalation bug.

When hybrid overlay clustersubnets is undefined, the hybrid overlay node subnet allocation is not managed by ovn-k.

But we need to ensures hybrid overlay node subnets are properly marked as allocated in the cluster subnet allocator when they overlap with the cluster subnet ranges, preventing potential subnet allocation conflicts.

The fix helps maintain proper subnet allocation tracking when hybrid overlay nodes use subnets that fall within the cluster's subnet ranges.

(cherry picked from commit 192f575)

📑 Description

Fixes #

Additional Information for reviewers

✅ Checks

My code requires changes to the documentation

if so, I have updated the documentation as required

My code requires tests

if so, I have added and/or updated the tests as required

All the tests have passed in the CI

How to verify it

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-bot · 2025-06-22T19:02:16Z

[ART PR BUILD NOTIFIER]

Distgit: ovn-kubernetes-base
This PR has been included in build ose-ovn-kubernetes-base-container-v4.18.0-202506221832.p0.gaeea339.assembly.stream.el9.
All builds following this will include this PR.

openshift-bot · 2025-06-22T19:20:24Z

[ART PR BUILD NOTIFIER]

Distgit: ovn-kubernetes-microshift
This PR has been included in build ovn-kubernetes-microshift-container-v4.18.0-202506221832.p0.gaeea339.assembly.stream.el9.
All builds following this will include this PR.

openshift-bot · 2025-06-22T19:29:24Z

[ART PR BUILD NOTIFIER]

Distgit: ose-ovn-kubernetes
This PR has been included in build ose-ovn-kubernetes-container-v4.18.0-202506221832.p0.gaeea339.assembly.stream.el9.
All builds following this will include this PR.

openshift-merge-robot · 2025-06-23T00:54:20Z

Fix included in accepted release 4.18.0-0.nightly-2025-06-22-200625

openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Jun 5, 2025

openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jun 5, 2025

openshift-ci bot requested review from trozet and tssurya June 5, 2025 02:54

pliurh changed the title ~~[release-4.18] OCPBUGS-57106: Fix hybrid overlay node subnets collision with cluster subnets~~ [release-4.18] OCPBUGS-57108: Fix hybrid overlay node subnets collision with cluster subnets Jun 5, 2025

openshift-ci-robot removed the jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. label Jun 5, 2025

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 18, 2025

openshift-ci bot added qe-approved Signifies that QE has signed off on this PR cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Jun 19, 2025

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 19, 2025

openshift-ci bot requested a review from zhaozhanqi June 19, 2025 07:20

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 19, 2025

openshift-ci bot assigned jechen0648, Meina-rh, mffiedler, qiowang721, rbbratta, weliang1 and yingwang-0320 Jun 19, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 19, 2025

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 19, 2025

openshift-merge-bot bot merged commit aeea339 into openshift:release-4.18 Jun 22, 2025
40 of 45 checks passed

[release-4.18] OCPBUGS-57108: Fix hybrid overlay node subnets collision with cluster subnets #2619

[release-4.18] OCPBUGS-57108: Fix hybrid overlay node subnets collision with cluster subnets #2619

Uh oh!

Conversation

pliurh commented Jun 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📑 Description

Additional Information for reviewers

✅ Checks

How to verify it

Uh oh!

openshift-ci-robot commented Jun 5, 2025

📑 Description

Additional Information for reviewers

✅ Checks

How to verify it

Uh oh!

openshift-ci-robot commented Jun 5, 2025

📑 Description

Additional Information for reviewers

✅ Checks

How to verify it

Uh oh!

pliurh commented Jun 18, 2025

Uh oh!

pliurh commented Jun 18, 2025

Uh oh!

pliurh commented Jun 18, 2025

Uh oh!

pliurh commented Jun 19, 2025

Uh oh!

zhaozhanqi commented Jun 19, 2025

Uh oh!

openshift-ci-robot commented Jun 19, 2025

📑 Description

Additional Information for reviewers

✅ Checks

How to verify it

Uh oh!

zhaozhanqi commented Jun 19, 2025

Uh oh!

openshift-ci-robot commented Jun 19, 2025

Uh oh!

zhaozhanqi commented Jun 19, 2025

Uh oh!

openshift-ci-robot commented Jun 19, 2025

Uh oh!

pliurh commented Jun 19, 2025

Uh oh!

openshift-ci-robot commented Jun 19, 2025

Uh oh!

pliurh commented Jun 19, 2025

Uh oh!

openshift-ci bot commented Jun 19, 2025

Uh oh!

openshift-ci-robot commented Jun 19, 2025

Uh oh!

jluhrsen commented Jun 19, 2025

Uh oh!

pliurh commented Jun 20, 2025

Uh oh!

zshi-redhat commented Jun 20, 2025

Uh oh!

zshi-redhat commented Jun 20, 2025

Uh oh!

pliurh commented Jun 20, 2025

Uh oh!

openshift-ci bot commented Jun 20, 2025

Uh oh!

deepsm007 commented Jun 20, 2025

Uh oh!

deepsm007 commented Jun 20, 2025

Uh oh!

openshift-ci-robot commented Jun 20, 2025

Uh oh!

openshift-ci-robot commented Jun 20, 2025

Uh oh!

pliurh commented Jun 21, 2025

Uh oh!

openshift-ci bot commented Jun 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

pliurh commented Jun 5, 2025 •

edited

Loading

openshift-ci bot commented Jun 21, 2025 •

edited

Loading