Skip to content

OCPBUGS-77046,OCPBUGS-77086: [release-4.21] combined backport PR for 2 escalations#2984

Merged
openshift-merge-bot[bot] merged 3 commits intoopenshift:release-4.21from
ricky-rav:OCPBUGS-70130_421
Feb 27, 2026
Merged

OCPBUGS-77046,OCPBUGS-77086: [release-4.21] combined backport PR for 2 escalations#2984
openshift-merge-bot[bot] merged 3 commits intoopenshift:release-4.21from
ricky-rav:OCPBUGS-70130_421

Conversation

@ricky-rav
Copy link
Copy Markdown
Contributor

@ricky-rav ricky-rav commented Feb 18, 2026

3 commits, 2 escalated bugs

OCPBUGS-77046: Remove IC zone migration HACK code

Some minor conflicts in go-controller/pkg/node/default_node_network_controller.go

Upstream PRs:

Downstream:

OCPBUGS-77086: [release-4.21] nodeallocator: fix subnet leak when hybrid overlay is enabled needs-ok-to-test

Originally posted here: #2990
Clean backport
Upstream:
ovn-kubernetes/ovn-kubernetes#5798

Downstream:

4.22: #2980

nodeallocator: fix subnet leak when hybrid overlay is enabled

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.

@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 18, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@ricky-rav: This pull request references Jira Issue OCPBUGS-77046, 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-70130 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:

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 18, 2026
@ricky-rav
Copy link
Copy Markdown
Contributor Author

/jira cherry-pick OCPBUGS-77046

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@ricky-rav: Jira Issue OCPBUGS-77046 has been cloned as Jira Issue OCPBUGS-77047. Will retitle bug to link to clone.
/retitle OCPBUGS-77047: OCPBUGS-77046: [release-4.21] Remove IC zone migration HACK code

Details

In response to this:

/jira cherry-pick OCPBUGS-77046

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.

Riccardo Ravaioli added 2 commits February 18, 2026 18:27
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)
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)
@openshift-ci openshift-ci Bot changed the title OCPBUGS-77046: [release-4.21] Remove IC zone migration HACK code OCPBUGS-77047: OCPBUGS-77046: [release-4.21] Remove IC zone migration HACK code Feb 18, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@ricky-rav: This pull request references Jira Issue OCPBUGS-77047, 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-77046 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-77046 to target a version in 4.22.0, but it targets "4.21.0" 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:

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-77047: OCPBUGS-77046: [release-4.21] Remove IC zone migration HACK code OCPBUGS-77046: [release-4.21] Remove IC zone migration HACK code Feb 18, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@ricky-rav: This pull request references Jira Issue OCPBUGS-77046, 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-70130 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.

Details

In 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
Copy link
Copy Markdown
Contributor Author

/retest-required

@ricky-rav ricky-rav changed the title OCPBUGS-77046: [release-4.21] Remove IC zone migration HACK code OCPBUGS-77046,OCPBUGS-77147,OCPBUGS-77086: [release-4.21] Remove IC zone migration HACK code Feb 24, 2026
@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. and removed jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. labels Feb 24, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@ricky-rav: This pull request references Jira Issue OCPBUGS-77046, 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-70130 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.

This pull request references Jira Issue OCPBUGS-77147, which is invalid:

  • expected dependent Jira Issue OCPBUGS-76500 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.

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

4 commits, 3 escalated bugs

OCPBUGS-77046: Remove IC zone migration HACK code

Some minor conflicts in go-controller/pkg/node/default_node_network_controller.go

Upstream PRs:

Downstream:

[release-4.21] OCPBUGS-77147: Minimize ACLs by combining ipBlocks into single ACL

Originally posted here: #2995

Manual cherry-pick of 14b7309 from PR #2978. No conflicts.

OCPBUGS-77086: [release-4.21] nodeallocator: fix subnet leak when hybrid overlay is enabled needs-ok-to-test

Originally posted here: #2990
Clean backport
Upstream:
ovn-kubernetes/ovn-kubernetes#5798

Downstream:

4.22: #2980

nodeallocator: fix subnet leak when hybrid overlay is enabled

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.

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-77046,OCPBUGS-77147,OCPBUGS-77086: [release-4.21] Remove IC zone migration HACK code OCPBUGS-77046,OCPBUGS-77147,OCPBUGS-77086: [release-4.21] combined backport PR for 3 escalations Feb 24, 2026
@ricky-rav
Copy link
Copy Markdown
Contributor Author

/ok-to-test
/payload 4.21 ci blocking
/payload 4.21 nightly blocking

@openshift-ci openshift-ci Bot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Feb 24, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Feb 24, 2026

@ricky-rav: trigger 5 job(s) of type blocking for the ci release of OCP 4.21

  • periodic-ci-openshift-release-main-ci-4.21-upgrade-from-stable-4.20-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-main-ci-4.21-upgrade-from-stable-4.20-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-main-ci-4.21-e2e-gcp-ovn-upgrade
  • periodic-ci-openshift-hypershift-release-4.21-periodics-e2e-aks
  • periodic-ci-openshift-hypershift-release-4.21-periodics-e2e-aws-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/7bf115d0-1171-11f1-8c80-0cd1d044b3fb-0

trigger 14 job(s) of type blocking for the nightly release of OCP 4.21

  • periodic-ci-openshift-release-main-nightly-4.21-e2e-aws-ovn-serial-1of2
  • periodic-ci-openshift-release-main-nightly-4.21-e2e-aws-ovn-serial-2of2
  • periodic-ci-openshift-release-main-ci-4.21-e2e-aws-upgrade-ovn-single-node
  • periodic-ci-openshift-release-main-ci-4.21-e2e-aws-ovn-techpreview
  • periodic-ci-openshift-release-main-ci-4.21-e2e-aws-ovn-techpreview-serial-1of3
  • periodic-ci-openshift-release-main-ci-4.21-e2e-aws-ovn-techpreview-serial-2of3
  • periodic-ci-openshift-release-main-ci-4.21-e2e-aws-ovn-techpreview-serial-3of3
  • periodic-ci-openshift-release-main-nightly-4.21-e2e-aws-ovn-upgrade-fips
  • periodic-ci-openshift-release-main-nightly-4.21-e2e-aws-ovn-upgrade-fips-no-nat-instance
  • periodic-ci-openshift-release-main-ci-4.21-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-main-ci-4.21-upgrade-from-stable-4.20-e2e-gcp-ovn-rt-upgrade
  • periodic-ci-openshift-hypershift-release-4.21-periodics-e2e-aws-ovn-conformance
  • periodic-ci-openshift-release-main-nightly-4.21-e2e-metal-ipi-ovn-bm
  • periodic-ci-openshift-release-main-nightly-4.21-e2e-metal-ipi-ovn-ipv6

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/7bf115d0-1171-11f1-8c80-0cd1d044b3fb-1

@ricky-rav
Copy link
Copy Markdown
Contributor Author

/test e2e-aws-ovn-edge-zones
/test e2e-aws-ovn-local-to-shared-gateway-mode-migration
/test e2e-metal-ipi-ovn-dualstack-bgp
/test e2e-metal-ipi-ovn-dualstack-bgp-local-gw

@ricky-rav
Copy link
Copy Markdown
Contributor Author

/jira refresh

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

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

  • expected dependent Jira Issue OCPBUGS-70130 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

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.

This pull request references Jira Issue OCPBUGS-77086, 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-66267 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

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.

Details

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.

@ricky-rav
Copy link
Copy Markdown
Contributor Author

https://issues.redhat.com/browse/OCPBUGS-77046 pre-merge tested by @SachinNinganure https://issues.redhat.com/browse/OCPBUGS-77086 pre-merge tested by @jechen0648 the third bug is still having issues for scale, yet to be verified.

holding the label

We've decided during the team meeting today to remove Peri's commit from the backports, since it doesn't fix the customer's issue.

/verified by QE

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Feb 26, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@ricky-rav: This PR has been marked as verified by QE.

Details

In response to this:

https://issues.redhat.com/browse/OCPBUGS-77046 pre-merge tested by @SachinNinganure https://issues.redhat.com/browse/OCPBUGS-77086 pre-merge tested by @jechen0648 the third bug is still having issues for scale, yet to be verified.

holding the label

We've decided during the team meeting today to remove Peri's commit from the backports, since it doesn't fix the customer's issue.

/verified by QE

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
Copy link
Copy Markdown
Contributor Author

/test e2e-aws-ovn-upgrade-local-gateway
/test e2e-gcp-ovn
/test e2e-gcp-ovn-techpreview
/test e2e-metal-ipi-ovn-dualstack-bgp

@ricky-rav
Copy link
Copy Markdown
Contributor Author

/test 4.21-upgrade-from-stable-4.20-e2e-gcp-ovn-rt-upgrade
/test e2e-gcp-ovn-techpreview

@kyrtapz
Copy link
Copy Markdown
Contributor

kyrtapz commented Feb 27, 2026

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Feb 27, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Feb 27, 2026

[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

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

@ricky-rav
Copy link
Copy Markdown
Contributor Author

/jira refresh

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@ricky-rav: This pull request references Jira Issue OCPBUGS-77046, 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.21.z) matches configured target version for branch (4.21.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-70130 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-70130 targets the "4.22.0" version, which is one of the valid target versions: 4.22.0
  • bug has dependents

Requesting review from QA contact:
/cc @anuragthehatter

This pull request references Jira Issue OCPBUGS-77086, which is invalid:

  • expected dependent Jira Issue OCPBUGS-66267 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

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.

Details

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.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Feb 27, 2026

@ricky-rav: The following test 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 7826344 link false /test security

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.

@ricky-rav
Copy link
Copy Markdown
Contributor Author

ricky-rav commented Feb 27, 2026

  • e2e-aws-ovn-edge-zones fails, but in reality 102/104 tests succeed and then there's a problem in how two tests should be skipped with the provided regex, resulting in an error and in the whole test failing:
Skipping tests:
Error: no tests were found matching the TEST_SKIPS regex:
internal should be reachable with hairpinning traffic
Requesting risk analysis for test failures in this job run from sippy:
I0224 19:04:05.832624    1304 factory.go:195] Registered Plugin "containerd"
  I0224 19:04:05.849843    1304 i18n.go:119] Couldn't find the LC_ALL, LC_MESSAGES or LANG environment variables, defaulting to en_US
  I0224 19:04:06.128686    1304 binary.go:77] Found 8508 test specs
  I0224 19:04:06.131300    1304 binary.go:94] 1058 test specs remain, after filtering out k8s
openshift-tests v4.1.0-10552-ga74cba4
time="2026-02-24T19:04:06Z" level=info msg="Scanning for test-failures-summary files in: /logs/artifacts/junit"
time="2026-02-24T19:04:06Z" level=info msg="Found files: []"
time="2026-02-24T19:04:06Z" level=info msg="Missing : test-failures-summary file(s), exiting"
{"component":"entrypoint","error":"wrapped process failed: exit status 1","file":"sigs.k8s.io/prow/pkg/entrypoint/run.go:84","func":"sigs.k8s.io/prow/pkg/entrypoint.Options.internalRun","level":"error","msg":"Error executing test process","severity":"error","time":"2026-02-24T19:04:06Z"}
error: failed to execute wrapped command: exit status 1

Already reported here: https://redhat-internal.slack.com/archives/GQ0CU2623/p1771857612299149?thread_ts=1771338827.722999&cid=GQ0CU2623

@ricky-rav
Copy link
Copy Markdown
Contributor Author

/jira refresh

@openshift-ci-robot 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 Feb 27, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@ricky-rav: This pull request references Jira Issue OCPBUGS-77046, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.21.z) matches configured target version for branch (4.21.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-70130 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-70130 targets the "4.22.0" version, which is one of the valid target versions: 4.22.0
  • bug has dependents

Requesting review from QA contact:
/cc @anuragthehatter

This pull request references Jira Issue OCPBUGS-77086, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.21.z) matches configured target version for branch (4.21.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-66267 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-66267 targets the "4.22.0" version, which is one of the valid target versions: 4.22.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (jechen@redhat.com), skipping review request.

Details

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.

@ricky-rav
Copy link
Copy Markdown
Contributor Author

/test e2e-metal-ipi-ovn-dualstack-bgp
/test e2e-metal-ipi-ovn-dualstack-bgp-local-gw

Let's retest these two lanes, since supposedly The HAProxy router should be able to connect to a service that is idled because a GET on the route will unidle it go fixed: https://redhat-internal.slack.com/archives/CDCP2LA9L/p1772129253041839?thread_ts=1771976693.098979&cid=CDCP2LA9L

@ricky-rav
Copy link
Copy Markdown
Contributor Author

/test 4.21-upgrade-from-stable-4.20-e2e-gcp-ovn-rt-upgrade

@kyrtapz
Copy link
Copy Markdown
Contributor

kyrtapz commented Feb 27, 2026

We are in a serious time crunch and the failures are unrelated to the changes we are bringing in as per Riccardo's analisys.
/override ci/prow/4.21-upgrade-from-stable-4.20-e2e-gcp-ovn-rt-upgrade
/override ci/prow/e2e-aws-ovn-edge-zones
/override ci/prow/qe-perfscale-payload-control-plane-6nodes
/override ci/prow/e2e-metal-ipi-ovn-dualstack-bgp
/override ci/prow/e2e-metal-ipi-ovn-dualstack-bgp-local-gw

@kyrtapz
Copy link
Copy Markdown
Contributor

kyrtapz commented Feb 27, 2026

/override ci/prow/4.21-upgrade-from-stable-4.20-e2e-gcp-ovn-rt-upgrade

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Feb 27, 2026

@kyrtapz: Overrode contexts on behalf of kyrtapz: ci/prow/4.21-upgrade-from-stable-4.20-e2e-gcp-ovn-rt-upgrade

Details

In response to this:

/override ci/prow/4.21-upgrade-from-stable-4.20-e2e-gcp-ovn-rt-upgrade

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.

@kyrtapz
Copy link
Copy Markdown
Contributor

kyrtapz commented Feb 27, 2026

/override ci/prow/e2e-aws-ovn-edge-zones
/override ci/prow/qe-perfscale-payload-control-plane-6nodes
/override ci/prow/e2e-metal-ipi-ovn-dualstack-bgp
/override ci/prow/e2e-metal-ipi-ovn-dualstack-bgp-local-gw

@kyrtapz
Copy link
Copy Markdown
Contributor

kyrtapz commented Feb 27, 2026

/override ci/prow/e2e-aws-ovn-edge-zones

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Feb 27, 2026

@kyrtapz: Overrode contexts on behalf of kyrtapz: ci/prow/e2e-aws-ovn-edge-zones, ci/prow/e2e-metal-ipi-ovn-dualstack-bgp, ci/prow/e2e-metal-ipi-ovn-dualstack-bgp-local-gw, ci/prow/qe-perfscale-payload-control-plane-6nodes

Details

In response to this:

/override ci/prow/e2e-aws-ovn-edge-zones
/override ci/prow/qe-perfscale-payload-control-plane-6nodes
/override ci/prow/e2e-metal-ipi-ovn-dualstack-bgp
/override ci/prow/e2e-metal-ipi-ovn-dualstack-bgp-local-gw

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-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Feb 27, 2026

@kyrtapz: Overrode contexts on behalf of kyrtapz: ci/prow/e2e-aws-ovn-edge-zones

Details

In response to this:

/override ci/prow/e2e-aws-ovn-edge-zones

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 81c9d5c into openshift:release-4.21 Feb 27, 2026
29 of 30 checks passed
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@ricky-rav: Jira Issue Verification Checks: Jira Issue OCPBUGS-77046
✔️ 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-77046 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-77086
✔️ 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-77086 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:

3 commits, 2 escalated bugs

OCPBUGS-77046: Remove IC zone migration HACK code

Some minor conflicts in go-controller/pkg/node/default_node_network_controller.go

Upstream PRs:

Downstream:

OCPBUGS-77086: [release-4.21] nodeallocator: fix subnet leak when hybrid overlay is enabled needs-ok-to-test

Originally posted here: #2990
Clean backport
Upstream:
ovn-kubernetes/ovn-kubernetes#5798

Downstream:

4.22: #2980

nodeallocator: fix subnet leak when hybrid overlay is enabled

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.

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

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. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.