Skip to content

[release-4.19] OCPBUGS-48709: DownStream Merge Sync from 4.20 [07-28-2025]#2688

Merged
openshift-merge-bot[bot] merged 85 commits intoopenshift:release-4.19from
jluhrsen:4.19-sync-from-4.20-07-23-2025
Aug 5, 2025
Merged

[release-4.19] OCPBUGS-48709: DownStream Merge Sync from 4.20 [07-28-2025]#2688
openshift-merge-bot[bot] merged 85 commits intoopenshift:release-4.19from
jluhrsen:4.19-sync-from-4.20-07-23-2025

Conversation

@jluhrsen
Copy link
Copy Markdown
Contributor

@jluhrsen jluhrsen commented Jul 23, 2025

4.20/master->4.19 branch sync PR

the original PR was opened with local branch dated 07.23-2025 which is no longer accurate since more commits were
added on 07-28-2025. the PR title reflects that though, and didn't want to create confusion on tracking this PR

npinaeva and others added 30 commits April 24, 2025 15:02
Signed-off-by: Nadia Pinaeva <npinaeva@redhat.com>
This helps to avoid confusion about defaulting the ACL tier.
Update BuildACL to require the tier as an argument.

Signed-off-by: Nadia Pinaeva <n.m.pinaeva@gmail.com>
Start using new BuildACL for all functions that need non-default tier.

Signed-off-by: Nadia Pinaeva <n.m.pinaeva@gmail.com>
…fic network

Previously every update `k8s.ovn.org/node-subnets` caused a call
to `nt.updateNode` on every network.

Signed-off-by: Patryk Diak <pdiak@redhat.com>
Signed-off-by: PGhiorzo <p.ghiorzo@reply.it>
Signed-off-by: Geo Turcsanyi <georgiana@ik.me>
Before UDN services controller was only stopped together with the whole
watchFactory, so there was no need to explicitly stop added event
handlers. With UDN we create and delete this controller per UDN, so
an explicit handler is required. Otherwise it will cause a memory leak.

Signed-off-by: Nadia Pinaeva <n.m.pinaeva@gmail.com>
This commit adds a user guide doc for the
OKEP-4380: Network QoS Support
https://github.com/ovn-kubernetes/ovn-kubernetes/blob/master/docs/okeps/okep-4380-network-qos.md

Signed-off-by: Flavio Fernandes <flavio@flaviof.com>
Signed-off-by: Nadia Pinaeva <n.m.pinaeva@gmail.com>
On cluster delete operations the container runtime binary
(represented by OCI_BIN) is hardcoded.

Set OCI_BIN according to env.

Signed-off-by: Or Mergi <ormergi@redhat.com>
Set OCI_BIN according to env.

Some inspect operation that use formatting did not work in
podman due to formatting differences comparing to docker.
The format string is changes to a form that fits both
docker and podman
With the new format string, the index keyword is redundant
hence removed.

Signed-off-by: Or Mergi <ormergi@redhat.com>
Set OCI_BIN according to env.

Some inspect operation that use formatting did not work in
podman due to formatting differences comparing to docker.
The format string is changes to a form that fits both
docker and podman.
With the new format string, the index keyword is redundant
hence removed.

Signed-off-by: Or Mergi <ormergi@redhat.com>
When using podman, BGP test suite fails due to checks against
the env container runtime which are not compatible with podman:
- Inspecting network objects is not compatible due to diffrences in
  how podman and docker persist network objects
- List containers using JSON format

To overcome the above, change network inspect operation and container
list using format to a form that compatible with bot docker and podman.

Signed-off-by: Or Mergi <ormergi@redhat.com>
The in_port was to match on IP traffic coming from the physical link to
be dispatched to conntrack and table 1 to find out whether the packet
was a reply to the host or to OVN. We are now conntracking these packets
also as they go to localnet ports attached to the bridge. Therefore we
need to also match on packets from those ports.

We do not want traffic from OVN or from LOCAL to hit this flow, but that
should be avoided by higher priority flows.

Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit 8c1594ee55408ae4748d7322bd093e2acbc0ce98)
This reverts commit ebb7339.

Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
This reverts commit 936e621.

Signed-off-by: Riccardo Ravaioli <rravaiol@redhat.com>
With the high load, UDN can be re-created and node-nad-controller needs
more time to update bridge config than zone-nad-controller, which
re-creates the external switch and causes ofport change.

Under high load node-nad-controller may miss delete+update NAD event,
so it will lawfully think that the network hasn't changed, while
zone-nad-controller can re-create the external switch, and that would
require a network re-create on the node side. Consider assigned network
ID to re-create network if the ID has changed.

Signed-off-by: Nadia Pinaeva <n.m.pinaeva@gmail.com>
Updates artwork based on cncf/artwork#574.

Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
The flag serves as a feature gate for the feature allowing
connecting workloads with preconfigured network to user-defined
networks [1].

OVN-Kuberentes flag name is "enable-preconfigured-udn-addresses".

The feature doesn't support non-interconnected mode, hence no
change for ovn-master manifests.
The feature doesn't support DPU mode, hence no change for
ovn-node-dpu and ovn-node-dpu-host manifests.
The feature gate take place on ovn-control-plane (ovn-cluster-manager)
and ovn-node (ovnkube-controller) containers, both single and multi zone modes.

In order to create development cluster with the FG enabled use the
flag "pre-conf-udn-addr-enable" or the shorter form "uae", for example:
$ (./contrib/kind.sh -ep podman -lr -i6 -ds -mne -nse -ikv -uae)

[1] ovn-kubernetes/ovn-kubernetes#5238

Signed-off-by: Or Mergi <ormergi@redhat.com>
Add flag for preconfigured UDN addresses feature
Modified line 277 to let kind-helm.sh run also behind a proxy
NodeTracker: Only update the node if the subnet changed for the specific network
Fix issues with localnet and openflow flows
Enable developemet around BGP using podman
scale test fixes: memory leak + changed ofport
when a step fails (e.g., e2e testing) the rest of the workflow
will not run unless it's tagged with always(). and when something
fails is exactly when we want to get some diags. move all
references to "Runner Diagnostics" to use always()

Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>
@tssurya
Copy link
Copy Markdown
Contributor

tssurya commented Aug 2, 2025

/lgtm

CI is looking good I'm approving

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 2, 2025
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Aug 2, 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 Aug 2, 2025
@tssurya
Copy link
Copy Markdown
Contributor

tssurya commented Aug 2, 2025

@jluhrsen I'm not adding the backport-risk-assessed till I either see a comment understanding the perf/scale failures or it passing. so have re-tested it

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Aug 2, 2025

@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/e2e-vsphere-ovn-techpreview 3b7c763 link false /test e2e-vsphere-ovn-techpreview
ci/prow/e2e-aws-ovn-hypershift-kubevirt 3b7c763 link false /test e2e-aws-ovn-hypershift-kubevirt
ci/prow/e2e-aws-ovn-hypershift-conformance-techpreview 3b7c763 link false /test e2e-aws-ovn-hypershift-conformance-techpreview
ci/prow/security 3b7c763 link false /test security
ci/prow/qe-perfscale-aws-ovn-small-udn-density-l3 3b7c763 link false /test qe-perfscale-aws-ovn-small-udn-density-l3

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.

@tssurya
Copy link
Copy Markdown
Contributor

tssurya commented Aug 5, 2025

/label backport-risk-assessed

ignoring perf/scale failures based on scale team input: https://redhat-internal.slack.com/archives/GQ0CU2623/p1753733237922249?thread_ts=1753290975.676879&cid=GQ0CU2623

@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 Aug 5, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit e243894 into openshift:release-4.19 Aug 5, 2025
45 of 50 checks passed
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@jluhrsen: 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:

4.20/master->4.19 branch sync PR

the original PR was opened with local branch dated 07.23-2025 which is no longer accurate since more commits were
added on 07-28-2025. the PR title reflects that though, and didn't want to create confusion on tracking this PR

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

[ART PR BUILD NOTIFIER]

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

@openshift-bot
Copy link
Copy Markdown
Contributor

[ART PR BUILD NOTIFIER]

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

@openshift-bot
Copy link
Copy Markdown
Contributor

[ART PR BUILD NOTIFIER]

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

@openshift-merge-robot
Copy link
Copy Markdown
Contributor

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

@openshift-merge-robot
Copy link
Copy Markdown
Contributor

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

@openshift-merge-robot
Copy link
Copy Markdown
Contributor

Fix included in accepted release 4.19.0-0.nightly-2026-03-13-234517

@openshift-merge-robot
Copy link
Copy Markdown
Contributor

Fix included in accepted release 4.19.0-0.nightly-2026-03-17-202923

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.