OCPBUGS-77083,OCPBUGS-77106: [release-4.18] combined backport PR for 2 escalations#2987
Conversation
openshift-ci-robot
added
jira/severity-important
|
@ricky-rav: This pull request references Jira Issue OCPBUGS-77083, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn response to this:
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
Bot
added
the
approved
|
/retest-required |
1 similar comment
|
/retest-required |
Remove the temporary migration code that was added in 2023 to support the transition to OVN Interconnect (IC) architecture. This HACK code tracked whether remote zone nodes had completed migration using the "k8s.ovn.org/remote-zone-migrated" annotation. This code is no longer needed. Changes: - Remove OvnNodeMigratedZoneName constant and helper functions (SetNodeZoneMigrated, HasNodeMigratedZone, NodeMigratedZoneAnnotationChanged) - Remove migrated field from nodeInfo struct in node_tracker.go - Simplify isLocalZoneNode() in base_network_controller.go and egressip.go - Remove HACK helper functions (checkOVNSBNodeLRSR, fetchLBNames, lbExists, portExists) and migration sync flow from default_node_network_controller.go - Remove remote-zone-migrated annotation from webhook allowed annotations - Update tests to remove references to the migration annotation Assisted by Claude Opus 4.5 <noreply@anthropic.com> Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com> (cherry picked from commit 7d408c1) (cherry picked from commit 83de58c) Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com> (cherry picked from commit e61ba4b) (cherry picked from commit ab1f578)
The layer2 UDN cleanup tests for IC clusters were failing because of a
zone mismatch between the controller and the test node:
- Controller zone: read from NBGlobal.Name ("global")
- Node zone: set via annotation ("test" when IC enabled)
This mismatch was previously masked in two spots:
1. The HACK in isLocalZoneNode() (removed by commit 7d408c1):
When the controller's zone was "global" (the default), the HACK
bypassed the zone comparison entirely and instead checked whether
the node had a migration annotation. Since the test node had no
migration annotation, it was treated as local despite the zone
mismatch.
2. Unconditional gateway cleanup in deleteNodeEvent (changed by
commit 8725a93 to only cleanup nodes tracked in localZoneNodes)
With both items above removed/changed, the test correctly fails because
the node is treated as remote (zones don't match), so it's not added to
localZoneNodes, and cleanup is skipped.
Fix the test by:
- using setupConfig() to set config.Default.Zone to testICZone when IC
is enabled
- setting NBGlobal.Name to config.Default.Zone (which setupConfig()
already configured correctly)
This ensures the controller and node are in the same zone, so the node
is correctly treated as local and its gateway entities are cleaned up.
🤖 Assisted by [Claude Code](https://claude.com/claude-code)
Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
(cherry picked from commit acb088c)
(cherry picked from commit e950ad5)
(cherry picked from commit c8ada1f)
(cherry picked from commit d1bc30c)
ricky-rav
force-pushed
the
OCPBUGS-70130_418
branch
from
126ddde to
2a503aa
Compare
ricky-rav
changed the title
openshift-ci-robot
added
jira/severity-critical
|
@ricky-rav: This pull request references Jira Issue OCPBUGS-77083, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. This pull request references Jira Issue OCPBUGS-77151, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. This pull request references Jira Issue OCPBUGS-77106, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn response to this:
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
changed the title
|
/ok-to-test |
openshift-ci
Bot
added
the
ok-to-test
|
@ricky-rav: trigger 4 job(s) of type blocking for the ci release of OCP 4.18
See details on https://pr-payload-tests.ci.openshift.org/runs/ci/aa81b580-1171-11f1-9bb1-5ef54b9fd7d7-0 trigger 10 job(s) of type blocking for the nightly release of OCP 4.18
See details on https://pr-payload-tests.ci.openshift.org/runs/ci/aa81b580-1171-11f1-9bb1-5ef54b9fd7d7-1 |
|
/retest-required |
|
/payload-job periodic-ci-openshift-hypershift-release-4.18-periodics-e2e-aws-ovn |
|
@ricky-rav: trigger 3 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command
See details on https://pr-payload-tests.ci.openshift.org/runs/ci/8fe67140-11ab-11f1-8dc0-7b0ebbcc57cc-0 |
|
/retest e2e-aws-ovn-hypershift |
|
/test e2e-aws-ovn-hypershift |
|
/payload-job periodic-ci-openshift-hypershift-release-4.18-periodics-e2e-aws-ovn |
|
@ricky-rav: trigger 2 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command
See details on https://pr-payload-tests.ci.openshift.org/runs/ci/f15bdf60-1236-11f1-9a43-b10e4168b34f-0 |
|
/payload-job periodic-ci-openshift-hypershift-release-4.18-periodics-e2e-aws-ovn |
|
@ricky-rav: trigger 2 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command
See details on https://pr-payload-tests.ci.openshift.org/runs/ci/7563d8e0-1308-11f1-8cac-7f235c577491-0 |
|
/label backport-risk-assessed |
openshift-ci-robot
added
jira/severity-important
|
@ricky-rav: This pull request references Jira Issue OCPBUGS-77083, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. This pull request references Jira Issue OCPBUGS-77106, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn response to this:
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
changed the title
|
@ricky-rav: This pull request references Jira Issue OCPBUGS-77083, which is invalid:
Comment This pull request references Jira Issue OCPBUGS-77106, which is invalid:
Comment DetailsIn response to this:
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. |
|
/jira refresh |
|
@ricky-rav: This pull request references Jira Issue OCPBUGS-77083, which is invalid:
Comment This pull request references Jira Issue OCPBUGS-77106, which is invalid:
Comment DetailsIn response to this:
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. |
|
OCPBUGS-77106 is pre-merge verified with this PR |
|
/test e2e-aws-ovn-upgrade |
/test e2e-aws-ovn-edge-zones |
|
@ricky-rav: The following test failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
|
/jira refresh |
openshift-ci-robot
added
jira/valid-bug
|
@ricky-rav: This pull request references Jira Issue OCPBUGS-77083, which is valid. The bug has been moved to the POST state. 7 validation(s) were run on this bug
Requesting review from QA contact: This pull request references Jira Issue OCPBUGS-77106, which is valid. The bug has been moved to the POST state. 7 validation(s) were run on this bug
No GitHub users were found matching the public email listed for the QA contact in Jira (jechen@redhat.com), skipping review request. DetailsIn response to this:
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. |
|
https://issues.redhat.com/browse/OCPBUGS-77083 verified by @SachinNinganure / @asood-rh Adding label based on results above |
openshift-ci-robot
added
the
verified
|
@asood-rh: This PR has been marked as verified by DetailsIn response to this:
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. |
|
/lgtm |
|
@ricky-rav: you cannot LGTM your own PR. DetailsIn response to this:
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. |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: kyrtapz, ricky-rav The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/override ci/prow/e2e-aws-ovn-edge-zones /tide refresh |
|
@ricky-rav: Overrode contexts on behalf of ricky-rav: ci/prow/e2e-aws-ovn-edge-zones DetailsIn response to this:
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. |
|
/tide refresh |
openshift-merge-bot
Bot
merged commit 0a68692
into
openshift:release-4.18
|
@ricky-rav: Jira Issue Verification Checks: Jira Issue OCPBUGS-77083 Jira Issue OCPBUGS-77083 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓 Jira Issue Verification Checks: Jira Issue OCPBUGS-77106 Jira Issue OCPBUGS-77106 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓 DetailsIn response to this:
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. |
13 participants
3 commits, 2 escalated bugs
OCPBUGS-77083: [release-4.18] Remove IC zone migration HACK code
Clean cherry pick of 4.19 backport: #2986
Upstream PRs:
Downstream:
OCPBUGS-77106: [release-4.18] nodeallocator: fix subnet leak when hybrid overlay is enabled
Clean backport of #2993
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.