Skip to content

OCPBUGS-77094: [release-4.20] nodeallocator: fix subnet leak when hybrid overlay is enabled#2992

Closed
aswinsuryan wants to merge 1 commit intoopenshift:release-4.20from
aswinsuryan:OCPBUGS-77094
Closed

OCPBUGS-77094: [release-4.20] nodeallocator: fix subnet leak when hybrid overlay is enabled#2992
aswinsuryan wants to merge 1 commit intoopenshift:release-4.20from
aswinsuryan:OCPBUGS-77094

Conversation

@aswinsuryan
Copy link
Copy Markdown
Contributor

@aswinsuryan aswinsuryan commented Feb 19, 2026

Clean backport of 2990

When the hybrid overlay feature is enabled (specifically when hybrid overlay cluster subnets are configured), the HandleDeleteNode function would return early after releasing the hybrid overlay subnet. This caused the regular cluster subnets allocated to the node to never be released, leading to a subnet leak that eventually exhausts the cluster CIDR pool.

This commit fixes the issue by removing the early return, ensuring that both the hybrid overlay subnets and the standard node subnets are properly released upon node deletion.

A new test case TestNodeAllocator_HandleDeleteNode is added to verify that both types of subnets are correctly released.

📑 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

When the hybrid overlay feature is enabled (specifically when hybrid overlay
cluster subnets are configured), the HandleDeleteNode function would return
early after releasing the hybrid overlay subnet. This caused the regular
cluster subnets allocated to the node to never be released, leading to a
subnet leak that eventually exhausts the cluster CIDR pool.

This commit fixes the issue by removing the early return, ensuring that
both the hybrid overlay subnets and the standard node subnets are
properly released upon node deletion.

A new test case TestNodeAllocator_HandleDeleteNode is added to verify
that both types of subnets are correctly released.

Signed-off-by: Aswin Suryanarayanan <asuryan@redhat.com>
(cherry picked from commit c44cbbf)
(cherry picked from commit 1836251)
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Feb 19, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@aswinsuryan: This pull request references Jira Issue OCPBUGS-77094, 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-77086 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

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:

When the hybrid overlay feature is enabled (specifically when hybrid overlay cluster subnets are configured), the HandleDeleteNode function would return early after releasing the hybrid overlay subnet. This caused the regular cluster subnets allocated to the node to never be released, leading to a subnet leak that eventually exhausts the cluster CIDR pool.

This commit fixes the issue by removing the early return, ensuring that both the hybrid overlay subnets and the standard node subnets are properly released upon node deletion.

A new test case TestNodeAllocator_HandleDeleteNode is added to verify that both types of subnets are correctly released.

📑 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 openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Feb 19, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Feb 19, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: aswinsuryan
Once this PR has been reviewed and has the lgtm label, please assign abhat for approval. For more information see the Code Review Process.

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

Details Needs approval from an approver in each of these files:

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

@openshift-ci openshift-ci Bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Feb 19, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Feb 19, 2026

Hi @aswinsuryan. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@aswinsuryan
Copy link
Copy Markdown
Contributor Author

closing since combined backport PR is raised

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@aswinsuryan: This pull request references Jira Issue OCPBUGS-77094. The bug has been updated to no longer refer to the pull request using the external bug tracker.

Details

In response to this:

Clean backport of 2990

When the hybrid overlay feature is enabled (specifically when hybrid overlay cluster subnets are configured), the HandleDeleteNode function would return early after releasing the hybrid overlay subnet. This caused the regular cluster subnets allocated to the node to never be released, leading to a subnet leak that eventually exhausts the cluster CIDR pool.

This commit fixes the issue by removing the early return, ensuring that both the hybrid overlay subnets and the standard node subnets are properly released upon node deletion.

A new test case TestNodeAllocator_HandleDeleteNode is added to verify that both types of subnets are correctly released.

📑 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.

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

Labels

jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants