Skip to content

[release-4.19] OCPBUGS-59530,OCPBUGS-48709: DownStream Merge Sync from 4.20 [07-17-2025]#2675

Merged
openshift-merge-bot[bot] merged 21 commits intoopenshift:release-4.19from
jluhrsen:4.19-sync-from-4.20-07-17-2025
Jul 23, 2025
Merged

[release-4.19] OCPBUGS-59530,OCPBUGS-48709: DownStream Merge Sync from 4.20 [07-17-2025]#2675
openshift-merge-bot[bot] merged 21 commits intoopenshift:release-4.19from
jluhrsen:4.19-sync-from-4.20-07-17-2025

Conversation

@jluhrsen
Copy link
Contributor

📑 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

trozet and others added 21 commits June 26, 2025 17:58
The FDB lookup is only used for non-destined shared MAC traffic. When
OVN or the host send a packet that hits a NORMAL action it will initate
MAC learning and can drive up the CPU of OVS. We still need NORMAL
action to account for sending to unknown ports like localnet ports, but
we do not want to learn the shared MAC. Therefore create a static entry
binding it to the LOCAL port.

Signed-off-by: Tim Rozet <trozet@redhat.com>
Commit f978967 caused a regression in performance. As the below issue
describes, the egress traffic from OVN will now use NORMAL action, which
will cause an FDB lookup and then FLOOD if not found. This always ends
up being the case because the reply ARP packet from the physical port is
flooded to the patch port and the LOCAL port. This causes an increase in
CPU and unnecessarily flooding packets.

We need layer 2 packets destined to the shared gateway mac to go to both
the host and OVN. This is so both can receive ARP replies, etc. However,
we also need the FDB entry in OVS to get updated, for our new
functionality with using the NORMAL action.

To fix this, add a static FDB entry for LOCAL, then modify the layer 2
flooding flow actions from "output:patch,LOCAL" to
"output:patch,NORMAL". Since the FDB entry is bound in the table to
LOCAL, it is effectively forwarding the packets the same as before, but
with the added bonus of FDB learning on ingress.

Fixes: #5318

Signed-off-by: Tim Rozet <trozet@redhat.com>
This allows a localnet VM arp reply to go to OVN, rather than a lookup
that only hits the LOCAL port in the fdb table.

Signed-off-by: Tim Rozet <trozet@redhat.com>
When using Docker, push image command fails because
the push_args var is interpreted as empty string, Docker
reject it as invalid variable and fails with the following error:
  $ docker push '' localhost:5000/ovn-daemonset-fedora:latest
  docker: 'docker push' requires 1 argument

Remove the push_args wrapping quotes.

Signed-off-by: Or Mergi <ormergi@redhat.com>
Since CanServeNamespace filters out namespace events for namespaces unknown
to be served by this primary network, we need to reconcile namespaces once
the network is reconfigured to serve a namespace.
Hence this commit reconciles those namespaces and also reconciles each network
policy if it contains only peer namespace selector.

Signed-off-by: Periyasamy Palanisamy <pepalani@redhat.com>
This commits exports FilterFunc from handler and uses it while
reconciling network policy for UDN peer namespaces.

Signed-off-by: Periyasamy Palanisamy <pepalani@redhat.com>
This commit makes network reconcilation loop to sync only namespace
object and network policies sync to happen from namespace reconcilation
loop.

Signed-off-by: Periyasamy Palanisamy <pepalani@redhat.com>
The diff between v0.7.0 and v0.8.0 is simply a rename from
ovn-org/libovsdb to ovn-kubernetes/libovsdb.

Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
Initial implementations erroneously assumed a CIDR for NATs
logicalIP.

Also, eip controller expects all OVN constructs that support
EIP to have this metadata so if we cannot build this metadata
then add dummy data so its cleaned up later by EIP controller.

This was not caught by unit tests because the unit test also
contained the assumption of only logical IP with no mask.

It was not caught by upstream CI because we have no reboot tests.

Signed-off-by: Martin Kennelly <mkennell@redhat.com>
The startup syncer was removing OVN constructs due to logic bugs
introduced when EIP code was refactored for UDN. The are added again
when eip controller syncs but this causes interruption.

1. Due to poor naming, enforcement of types and programmer error
we were mixing up variables between a pod IP and an EIP IP.
See:
nodeName, ok := cache.egressIPIPToNodeCache[parsedLogicalIP.String()]

parsedLogicalIP is a pod IP and not an EIP IP.

2. When iterating over the existing config for an EIP, we should
delete config for LRPs where an EIP doesn't exist.

3. Remove LRPs when a network isnt found

Signed-off-by: Martin Kennelly <mkennell@redhat.com>
…readability

No func changes.
Check if obj is nil post parsing IP.
Improve logging of stale OVN config.

Signed-off-by: Martin Kennelly <mkennell@redhat.com>
Removes config for deleted nodes/pods while controller
was down and ensures ovn config is removed while preserving
valid config.

Signed-off-by: Martin Kennelly <mkennell@redhat.com>
Fixes FDB learning and usage of NORMAL action
Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>
NO-JIRA: Update OWNERS file: Add Patryk/Martin as approvers
OCPBUGS-57179, OCPBUGS-49824: DownStream Merge [07-09-2025]
@openshift-ci-robot openshift-ci-robot added 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 Jul 17, 2025
@openshift-ci-robot
Copy link
Contributor

@jluhrsen: This pull request references Jira Issue OCPBUGS-48709, which is invalid:

  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Verified 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:

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

/payload 4.19 ci blocking
/payload 4.19 nightly blocking

@openshift-ci openshift-ci bot requested review from abhat and jcaamano July 17, 2025 21:30
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 17, 2025

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

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

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/187c88b0-6355-11f0-99cd-1bdb0a8a6dc4-0

trigger 11 job(s) of type blocking for the nightly release of OCP 4.19

  • periodic-ci-openshift-release-master-nightly-4.19-e2e-aws-ovn-serial
  • periodic-ci-openshift-release-master-ci-4.19-e2e-aws-upgrade-ovn-single-node
  • periodic-ci-openshift-release-master-ci-4.19-e2e-aws-ovn-techpreview
  • periodic-ci-openshift-release-master-ci-4.19-e2e-aws-ovn-techpreview-serial
  • periodic-ci-openshift-release-master-nightly-4.19-e2e-aws-ovn-upgrade-fips
  • periodic-ci-openshift-release-master-ci-4.19-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.19-fips-payload-scan
  • periodic-ci-openshift-release-master-ci-4.19-upgrade-from-stable-4.18-e2e-gcp-ovn-rt-upgrade
  • periodic-ci-openshift-hypershift-release-4.19-periodics-e2e-aws-ovn-conformance
  • periodic-ci-openshift-release-master-nightly-4.19-e2e-metal-ipi-ovn-bm
  • periodic-ci-openshift-release-master-nightly-4.19-e2e-metal-ipi-ovn-ipv6

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/187c88b0-6355-11f0-99cd-1bdb0a8a6dc4-1

@jluhrsen
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Jul 17, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 22, 2025

@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.19-e2e-aws-upgrade-ovn-single-node

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/545d9a70-673a-11f0-923b-ec6d826250ec-0

@martinkennelly
Copy link
Contributor

looks good to me now

Copy link
Contributor

@tssurya tssurya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/label backport-risk-assessed

CI looks good

@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 Jul 23, 2025
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 23, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 23, 2025

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 23, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit a71aaf8 into openshift:release-4.19 Jul 23, 2025
45 of 49 checks passed
@openshift-ci-robot
Copy link
Contributor

@jluhrsen: Jira Issue OCPBUGS-59530: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-59530 has been moved to the MODIFIED state.

Jira Issue OCPBUGS-48709: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-48709 has been moved to the MODIFIED state.

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.

@jechen0648
Copy link
Contributor

/bugzilla cc-qa
/label qe-approved

this PR was pre-merge verified by QE, was just a bit late at adding the labels after pre-merge test passed

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Jul 23, 2025
@openshift-ci-robot
Copy link
Contributor

@jluhrsen: Jira Issue OCPBUGS-59530 is in an unrecognized state (MODIFIED) and will not be moved to the MODIFIED state.

Jira Issue OCPBUGS-48709 is in an unrecognized state (MODIFIED) and will not be moved to the MODIFIED state.

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

[ART PR BUILD NOTIFIER]

Distgit: ovn-kubernetes-base
This PR has been included in build ose-ovn-kubernetes-base-container-v4.19.0-202507232110.p0.ga71aaf8.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ovn-kubernetes-microshift
This PR has been included in build ovn-kubernetes-microshift-container-v4.19.0-202507240107.p0.ga71aaf8.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-ovn-kubernetes
This PR has been included in build ose-ovn-kubernetes-container-v4.19.0-202507240107.p0.ga71aaf8.assembly.stream.el9.
All builds following this will include this PR.

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.19.0-0.nightly-2025-08-05-174154

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.19.0-0.nightly-2025-09-02-192040

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. qe-approved Signifies that QE has signed off on this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.