Skip to content

Conversation

@pperiyasamy
Copy link
Member

@pperiyasamy pperiyasamy commented Oct 29, 2025

Manual cherry-pick of 4.21 commits corresponding to upstream PRs ovn-kubernetes/ovn-kubernetes#5493, ovn-kubernetes/ovn-kubernetes#5606 and ovn-kubernetes/ovn-kubernetes#5696 . No conflicts.

@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Oct 29, 2025
@openshift-ci-robot
Copy link
Contributor

@pperiyasamy: This pull request references Jira Issue OCPBUGS-63686, 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-50709 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.

In response to this:

Manual cherry-pick of 4.21 commits corresponding to upstream PRs ovn-kubernetes/ovn-kubernetes#5606 and ovn-kubernetes/ovn-kubernetes#5493 . No conflicts.

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 openshift-ci bot requested review from jcaamano and tssurya October 29, 2025 16:08
martinkennelly and others added 7 commits November 7, 2025 12:59
…odes

Previously, we were checking if the next hop IP is valid
for the current set of nodes but we werent but
every EgressIP is assigned to a subset of the total nodes.

Stale LRPs could occur if a node hosted eip pods,
ovnkube-controller is down, and the EIP moved
to a new Node which said controller is down.

Signed-off-by: Martin Kennelly <mkennell@redhat.com>
Signed-off-by: Periyasamy Palanisamy <pepalani@redhat.com>
(cherry picked from commit d2b7cbe)
For IC mode, there is no expectation we can fetch
a remote nodes LSP, therefore, by skipping (continue),
it is causing us to skip generating valid next
hops for the remote node.

Later in sync LRPs, when a valid next hop is inspected,
we do not find it valid and remove that valid next hop.

Handlers will re-add it shortly later.

Signed-off-by: Martin Kennelly <mkennell@redhat.com>
(cherry picked from commit a46e0e7)
Signed-off-by: Martin Kennelly <mkennell@redhat.com>
(cherry picked from commit 2735d6b)
Previous to this change, we dont emit log error
for stale next hops.

Signed-off-by: Martin Kennelly <mkennell@redhat.com>
(cherry picked from commit ab082bd)
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>
(cherry picked from commit 1667a51)
During an ovnkube-controller restart, pod add/remove events
for EgressIP-served pods may occur before the factory.egressIPPod
handler is registered in the watch factory. As a result, the EIP
controller never able to handle pod delete, leading to stale
logical router policy (LRP) entry.

Scenario:

ovnkube-controller starts.

The EIP controller processes the namespace add event (oc.WatchEgressIPNamespaces)
and creates an LRP entry for the served pod.

The pod is deleted.

The factory.egressIPPod handler registration happens afterward via oc.WatchEgressIPPods.

The pod delete event is never processed by the EIP controller.

Fix:

1. Start oc.WatchEgressIPPods followed by oc.WatchEgressIPNamespaces.
2. Sync EgressIPs before registering factory.egressIPPod event handler.
3. Removal of Sync EgressIPs for factory.EgressIPNamespaceType which is no longer needed.

Signed-off-by: Periyasamy Palanisamy <pepalani@redhat.com>
(cherry picked from commit 8975b00)
When the EIP controller cleans up a stale EIP assignment for a pod,
it also removes the pod object from the podAssignment cache.
This is incorrect, as it prevents the EIP controller from processing
the subsequent pod delete event.

Scenario:

1. pod-1 is served by eip-1, both hosted on node1.
2. node1’s ovnkube-controller restarts.
3. Pod add event is received by the EIP controller — no changes.
4. eip-1 moves from node1 to node0.
5. The EIP controller receives the eip-1 add event.
6. eip-1 cleans up pod-1’s stale assignment (SNAT and LRP) for node1,
   but removes the pod object from the podAssignment cache when no other
   assignments found.
7. The EIP controller programs the LRP entry with node0’s transit IP as
   the next hop, but the pod assignment cache is not updated with new
   podAssignmentState.
8. The pod delete event is received by the EIP controller but ignored,
   since the pod object is missing from the assignment cache.

So this commit fixes the issue by adding podAssignmentState back into
podAssignment cache at step 7.

Signed-off-by: Periyasamy Palanisamy <pepalani@redhat.com>
(cherry picked from commit 16dedd1)
@pperiyasamy pperiyasamy force-pushed the eip_failover_ovnkubenode_restart_4.20 branch from 6065e51 to f4e2c17 Compare November 7, 2025 12:04
@openshift-ci-robot
Copy link
Contributor

@pperiyasamy: This pull request references Jira Issue OCPBUGS-63686, which is invalid:

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

In response to this:

Manual cherry-pick of 4.21 commits corresponding to upstream PRs ovn-kubernetes/ovn-kubernetes#5493, ovn-kubernetes/ovn-kubernetes#5606 and ovn-kubernetes/ovn-kubernetes#5696 . No conflicts.

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.

@pperiyasamy
Copy link
Member Author

/payload 4.20 ci blocking
/payload 4.20 nightly blocking

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 7, 2025

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

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

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/eb54a6e0-bbdf-11f0-8836-a824119b6a7f-0

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

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

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/eb54a6e0-bbdf-11f0-8836-a824119b6a7f-1

@pperiyasamy
Copy link
Member Author

/payload-job periodic-ci-openshift-release-master-ci-4.20-e2e-aws-upgrade-ovn-single-node
/payload-job periodic-ci-openshift-release-master-ci-4.20-e2e-aws-ovn-techpreview-serial-1of3
/payload-job periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-upgrade-fips

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 10, 2025

@pperiyasamy: trigger 3 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-ci-4.20-e2e-aws-upgrade-ovn-single-node
  • periodic-ci-openshift-release-master-ci-4.20-e2e-aws-ovn-techpreview-serial-1of3
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-upgrade-fips

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/5a75e480-be42-11f0-92f8-f4e3ce198e6d-0

@jluhrsen
Copy link
Contributor

/test okd-scos-e2e-aws-ovn

@qiowang721
Copy link

/verified by @qiowang721

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Nov 11, 2025
@openshift-ci-robot
Copy link
Contributor

@qiowang721: This PR has been marked as verified by @qiowang721.

In response to this:

/verified by @qiowang721

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.

@pperiyasamy
Copy link
Member 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 Nov 11, 2025
@openshift-ci-robot
Copy link
Contributor

@pperiyasamy: This pull request references Jira Issue OCPBUGS-63686, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.20.z) matches configured target version for branch (4.20.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-50709 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-50709 targets the "4.21.0" version, which is one of the valid target versions: 4.21.0
  • bug has dependents

Requesting review from QA contact:
/cc @huiran0826

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 openshift-ci bot requested a review from huiran0826 November 11, 2025 10:28
@pperiyasamy
Copy link
Member Author

/assign @jcaamano

@jcaamano
Copy link
Contributor

/override ci/prow/lint
/lgtm
/approve
/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Nov 12, 2025
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 12, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 12, 2025

[APPROVALNOTIFIER] This PR is APPROVED

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

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

The pull request process is described here

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

openshift-ci bot commented Nov 12, 2025

@jcaamano: Overrode contexts on behalf of jcaamano: ci/prow/lint

In response to this:

/override ci/prow/lint
/lgtm
/approve
/label backport-risk-assessed

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 12, 2025
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD c7e12ae and 2 for PR HEAD f4e2c17 in total

@pperiyasamy
Copy link
Member Author

/retest-required

2 similar comments
@jluhrsen
Copy link
Contributor

/retest-required

@huiran0826
Copy link

/retest-required

@pperiyasamy
Copy link
Member Author

@jcaamano The e2e-gcp-ovn-techpreview job failure is happening because of recent MCO PR openshift/machine-config-operator#5397 being discussed at here, so i think we can override this job to unblock the merge.

@jcaamano
Copy link
Contributor

/override ci/prow/e2e-gcp-ovn-techpreview

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 13, 2025

@jcaamano: Overrode contexts on behalf of jcaamano: ci/prow/e2e-gcp-ovn-techpreview

In response to this:

/override ci/prow/e2e-gcp-ovn-techpreview

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
Contributor

openshift-ci bot commented Nov 13, 2025

@pperiyasamy: 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/security 6065e51 link false /test security
ci/prow/e2e-gcp-ovn-techpreview f4e2c17 link true /test e2e-gcp-ovn-techpreview

Full PR test history. Your PR dashboard.

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.

@openshift-merge-bot openshift-merge-bot bot merged commit 27e34ff into openshift:release-4.20 Nov 13, 2025
29 of 30 checks passed
@openshift-ci-robot
Copy link
Contributor

@pperiyasamy: Jira Issue Verification Checks: Jira Issue OCPBUGS-63686
✔️ 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-63686 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

In response to this:

Manual cherry-pick of 4.21 commits corresponding to upstream PRs ovn-kubernetes/ovn-kubernetes#5493, ovn-kubernetes/ovn-kubernetes#5606 and ovn-kubernetes/ovn-kubernetes#5696 . No conflicts.

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-critical Referenced Jira bug's severity is critical 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. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.