NO-JIRA: Branch Sync release-4.19 to release-4.18 [03-02-2026]#3017
NO-JIRA: Branch Sync release-4.19 to release-4.18 [03-02-2026]#3017openshift-pr-manager[bot] wants to merge 5 commits intorelease-4.18from
Conversation
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)
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)
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 7826344) (cherry picked from commit 26f2508)
OCPBUGS-77082,OCPBUGS-77096: [release-4.19] combined backport PR for 2 escalations
…4.19-to-release-4.18-03-02-2026
|
/ok-to-test |
openshift-ci-robot
added
the
jira/valid-reference
|
@openshift-pr-manager[bot]: This pull request explicitly references no jira issue. 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-pr-manager[bot]: 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/a8e8f770-162f-11f1-9272-19ff837a72e9-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/a8e8f770-162f-11f1-9272-19ff837a72e9-1 |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: openshift-pr-manager[bot] The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
openshift-ci
Bot
added
the
ok-to-test
|
/test e2e-aws-ovn-edge-zones |
|
/payload-job periodic-ci-openshift-hypershift-release-4.18-periodics-e2e-aws-ovn-conformance |
|
@jluhrsen: trigger 1 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/f4642db0-1665-11f1-9973-79117140a35e-0 |
|
/test e2e-aws-ovn-edge-zones |
|
/payload-job periodic-ci-openshift-hypershift-release-4.18-periodics-e2e-aws-ovn-conformance |
|
@jluhrsen: trigger 1 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/65bbd3b0-16a1-11f1-85b2-e658f71b566e-0 |
|
/test e2e-aws-ovn-edge-zones |
|
/payload-job periodic-ci-openshift-hypershift-release-4.18-periodics-e2e-aws-ovn-conformance |
|
@jluhrsen: trigger 1 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/12a1ae70-16ba-11f1-8a75-bc5616669c3f-0 |
|
/retest-required |
|
/test e2e-aws-ovn-edge-zones |
|
/payload-job periodic-ci-openshift-hypershift-release-4.18-periodics-e2e-aws-ovn-conformance |
|
@jluhrsen: trigger 1 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/55f8d840-1720-11f1-9bf9-b9700e7fed93-0 |
|
/test e2e-aws-ovn-edge-zones |
|
/payload-job periodic-ci-openshift-hypershift-release-4.18-periodics-e2e-aws-ovn-conformance |
|
@jluhrsen: trigger 1 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/fc2141a0-174b-11f1-9567-37b18a6da433-0 |
|
/payload-job periodic-ci-openshift-hypershift-release-4.18-periodics-e2e-aws-ovn-conformance |
|
@jluhrsen: trigger 1 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/a08ad8f0-18b4-11f1-86c7-582a6d5415a8-0 |
|
/payload-job periodic-ci-openshift-hypershift-release-4.18-periodics-e2e-aws-ovn-conformance |
|
@jluhrsen: trigger 1 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/12184100-1efb-11f1-8128-f59c3442f31d-0 |
|
/test e2e-aws-ovn-edge-zones |
1 similar comment
|
/test e2e-aws-ovn-edge-zones |
|
@openshift-pr-manager[bot]: 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. |
Actually, you are right about that. /hold we don't want this PR. we just need to keep it open to prevent automation from just recreating it. Once our 4.19 sync PR merges we can close this one and a new 4.18 sync will get opened with more commits. BTW, these three commits will still be included in that new PR. it's the downside of doing the manual cherry picks and |
openshift-ci
Bot
added
the
do-not-merge/hold
|
/test e2e-aws-ovn-edge-zones |
/close looks like our 4.19 sync landed so we can close this and let automation create a new one. |
|
@jluhrsen: Closed this 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. |
3 participants
Automated branch sync: release-4.19 to release-4.18.