OCPBUGS-50709: DownStream Merge [10-28-2025] by jluhrsen · Pull Request #2832 · openshift/ovn-kubernetes

jluhrsen · 2025-10-28T19:20:00Z

📑 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

We need to differentiate between the field not being set and field being set to 0 which means no available capacity on that node. Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>

…d-capacity-support EIP: Change capacity storage to pointers

Scenario: - Nodes: node-1, node-2, node-3 - Egress IPs: EIP-1 - Pods: pod1 on node-1, pod2 on node-3 (pods are created via deployment replicas) - Egress-assignable nodes: node-1, node-2 - EIP-1 assigned to node-1 During a simultaneous reboot of node-1 and node-2, EIP-1 failed over to node-2 and ovnkube-controller restarted at nearly the same time: 1) EIP-1 was reassigned to node-2 by the cluster manager. 2) The sync EIP happened for EIP1 with stale status, though it cleaned SNATs/LRPs referring to node-1 due to outdated pod IPs (this is because pods will be recreated due to node reboots). 3) pod1/pod2 Add events arrived while the informer cache still had the old EIP status, so new SNATs/LRPs were created pointing to node-1. 4) The EIP-1 Add event arrived with the new status; entries for node-2 were added/updated. 5) Result: stale SNATs and LRPs with stale nexthops for node-1 remained. Fix: - Populate pod EIP status during EgressIP sync so podAssignment has accurate egressStatuses. - Reconcile stale assignments using podAssignment (egressStatuses) when the informer cache is not up to date, ensuring SNAT/LRP for the previously assigned node are corrected. - Remove stale EIP SNAT entries for remote-zone pods accordingly. - Add coverage for simultaneous EIP failover and controller restart. Signed-off-by: Periyasamy Palanisamy <pepalani@redhat.com>

openshift-ci-robot · 2025-10-28T19:20:08Z

@jluhrsen: This pull request references Jira Issue OCPBUGS-50709, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.21.0) matches configured target version for branch (4.21.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @huiran0826

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

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

jluhrsen · 2025-10-28T19:21:50Z

/payload 4.21 ci blocking
/payload 4.21 nightly blocking

openshift-ci · 2025-10-28T19:21:52Z

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

periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-aws-ovn-upgrade
periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-azure-ovn-upgrade
periodic-ci-openshift-release-master-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/5aa6ad90-b433-11f0-8890-276b2b004eb1-0

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

periodic-ci-openshift-release-master-ci-4.21-e2e-aws-upgrade-ovn-single-node
periodic-ci-openshift-release-master-nightly-4.21-e2e-aws-ovn-upgrade-fips
periodic-ci-openshift-release-master-ci-4.21-e2e-azure-ovn-upgrade
periodic-ci-openshift-release-master-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-master-nightly-4.21-e2e-aws-ovn-serial-1of2
periodic-ci-openshift-release-master-nightly-4.21-e2e-aws-ovn-serial-2of2
periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview
periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-1of3
periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-2of3
periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-3of3
periodic-ci-openshift-release-master-nightly-4.21-e2e-metal-ipi-ovn-bm
periodic-ci-openshift-release-master-nightly-4.21-e2e-metal-ipi-ovn-ipv6

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/5aa6ad90-b433-11f0-8890-276b2b004eb1-1

asood-rh · 2025-10-29T02:32:48Z

/test e2e-aws-ovn-fdp-qe

jluhrsen · 2025-10-29T04:34:57Z

/retest

and, wow, probably the best first-run of payloads I've ever seen. only one to re-run:

/payload-job periodic-ci-openshift-release-master-ci-4.21-e2e-azure-ovn-upgrade

openshift-ci · 2025-10-29T04:35:06Z

@jluhrsen: 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.21-e2e-azure-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/a021ab20-b480-11f0-8bc2-78c486e67beb-0

asood-rh · 2025-10-29T07:32:16Z

We can mark this PR verified with CI with QE 's perspective as FDP QE workflow succeeded

pperiyasamy · 2025-10-29T10:01:28Z

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

huiran0826 · 2025-10-29T14:16:03Z

/verified by 'Pre-merge testing'

openshift-ci-robot · 2025-10-29T14:16:15Z

@huiran0826: This PR has been marked as verified by 'Pre-merge testing'.

Details

In response to this:

/verified by 'Pre-merge testing'

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 · 2025-10-29T14:58:12Z

@jluhrsen: 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/okd-scos-e2e-aws-ovn	`e9ebeac`	link	false	`/test okd-scos-e2e-aws-ovn`
ci/prow/security	`e9ebeac`	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.

pperiyasamy · 2025-10-29T15:51:31Z

/payload-job periodic-ci-openshift-release-master-ci-4.21-e2e-azure-ovn-upgrade

openshift-ci · 2025-10-29T15:51:42Z

@pperiyasamy: 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.21-e2e-azure-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/2460b670-b4df-11f0-8a53-1c8c74f9199a-0

jluhrsen · 2025-10-29T16:16:11Z

@jcaamano we can /override e2e-metal-ipi-ovn-dualstack-bgp-local-gw here right? need to get lint too

pperiyasamy · 2025-10-30T05:14:33Z

/payload-job periodic-ci-openshift-release-master-ci-4.21-e2e-azure-ovn-upgrade

openshift-ci · 2025-10-30T05:14:36Z

@pperiyasamy: 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.21-e2e-azure-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/52ac41f0-b54f-11f0-86d7-8f46367acd44-0

jcaamano · 2025-10-30T09:48:11Z

/override ci/prow/lint
/override ci/prow/e2e-metal-ipi-ovn-dualstack-bgp-local-gw

openshift-ci · 2025-10-30T09:49:01Z

@jcaamano: Overrode contexts on behalf of jcaamano: ci/prow/e2e-metal-ipi-ovn-dualstack-bgp-local-gw, ci/prow/lint

Details

In response to this:

/override ci/prow/lint
/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.

jcaamano · 2025-10-30T10:38:56Z

/payload-job periodic-ci-openshift-release-master-ci-4.21-e2e-azure-ovn-upgrade

openshift-ci · 2025-10-30T10:39:02Z

@jcaamano: 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.21-e2e-azure-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/a388f780-b57c-11f0-8a13-9a1701500db7-0

huiran0826 · 2025-10-30T12:46:18Z

/remove-label verified

openshift-ci · 2025-10-30T12:46:22Z

@huiran0826: The label(s) /remove-label verified cannot be applied. These labels are supported: acknowledge-critical-fixes-only, platform/aws, platform/azure, platform/baremetal, platform/google, platform/libvirt, platform/openstack, ga, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, px-approved, docs-approved, qe-approved, ux-approved, no-qe, downstream-change-needed, rebase/manual, cluster-config-api-changed, run-integration-tests, approved, backport-risk-assessed, bugzilla/valid-bug, cherry-pick-approved, jira/valid-bug, ok-to-test, stability-fix-approved, staff-eng-approved. Is this label configured under labels -> additional_labels or labels -> restricted_labels in plugin.yaml?

Details

In response to this:

/remove-label verified

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.

jluhrsen · 2025-10-30T16:45:15Z

@martinkennelly @jcaamano I think we are good here.

@huiran0826 , why did you try to remove the verified label?

jcaamano · 2025-10-30T18:55:52Z

/lgtm
/approve

openshift-ci · 2025-10-30T18:56:20Z

[APPROVALNOTIFIER] This PR is APPROVED

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

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:

~~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-10-30T19:00:22Z

@jluhrsen: Jira Issue Verification Checks: Jira Issue OCPBUGS-50709
✔️ 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-50709 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:

📑 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-merge-robot · 2025-11-04T03:57:00Z

Fix included in accepted release 4.21.0-0.nightly-2025-11-03-191704

tssurya and others added 4 commits October 21, 2025 00:45

EIP: Change capacity storage to pointers

7e59c3c

We need to differentiate between the field not being set and field being set to 0 which means no available capacity on that node. Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>

Merge pull request #5676 from tssurya/egress-ip-cloud-remove-unlimite…

a525cee

…d-capacity-support EIP: Change capacity storage to pointers

Merge remote-tracking branch 'ovn-org/master' into d/s-merge-10-28-2025

e9ebeac

openshift-ci bot requested review from huiran0826, jcaamano and martinkennelly October 28, 2025 19:20

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Oct 29, 2025

openshift-ci bot assigned jcaamano Oct 30, 2025

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

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

openshift-merge-bot bot merged commit f165407 into openshift:master Oct 30, 2025
31 of 33 checks passed

Conversation

jluhrsen commented Oct 28, 2025

📑 Description

Additional Information for reviewers

✅ Checks

How to verify it

Uh oh!

openshift-ci-robot commented Oct 28, 2025

📑 Description

Additional Information for reviewers

✅ Checks

How to verify it

Uh oh!

jluhrsen commented Oct 28, 2025

Uh oh!

openshift-ci bot commented Oct 28, 2025

Uh oh!

asood-rh commented Oct 29, 2025

Uh oh!

jluhrsen commented Oct 29, 2025

Uh oh!

openshift-ci bot commented Oct 29, 2025

Uh oh!

asood-rh commented Oct 29, 2025

Uh oh!

pperiyasamy commented Oct 29, 2025

Uh oh!

huiran0826 commented Oct 29, 2025

Uh oh!

openshift-ci-robot commented Oct 29, 2025

Uh oh!

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

Uh oh!

Uh oh!

pperiyasamy commented Oct 29, 2025

Uh oh!

openshift-ci bot commented Oct 29, 2025

Uh oh!

jluhrsen commented Oct 29, 2025

Uh oh!

pperiyasamy commented Oct 30, 2025

Uh oh!

openshift-ci bot commented Oct 30, 2025

Uh oh!

jcaamano commented Oct 30, 2025

Uh oh!

openshift-ci bot commented Oct 30, 2025

Uh oh!

jcaamano commented Oct 30, 2025

Uh oh!

openshift-ci bot commented Oct 30, 2025

Uh oh!

huiran0826 commented Oct 30, 2025

Uh oh!

openshift-ci bot commented Oct 30, 2025

Uh oh!

jluhrsen commented Oct 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jcaamano commented Oct 30, 2025

Uh oh!

openshift-ci bot commented Oct 30, 2025

Uh oh!

Uh oh!

openshift-ci-robot commented Oct 30, 2025

📑 Description

Additional Information for reviewers

✅ Checks

How to verify it

Uh oh!

openshift-merge-robot commented Nov 4, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

openshift-ci bot commented Oct 29, 2025 •

edited

Loading

jluhrsen commented Oct 30, 2025 •

edited

Loading