OCPBUGS-56749: DownStream Merge [10-24-2025]#2829

Merged

openshift-merge-bot[bot] merged 43 commits intomasterfrom

d/s-merge-10-24-2025

Oct 28, 2025

openshift-pr-manager bot commented Oct 24, 2025

Automated merge of upstream/master → master.

ormergi and others added 30 commits

August 27, 2025 13:25


          kind,kubevirt: Rm redundent URL call

cb24e1a

Signed-off-by: Or Mergi <ormergi@redhat.com>


          kind,kubevirt: Combine CR patches

dec64da

Combine Kubevirt CR patched to one call.
Change the flow to patch and then wait for readiness.

Signed-off-by: Or Mergi <ormergi@redhat.com>


          [gateway] Pass GatewayConfig to functions to simplify function calls.

37da384

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


          [GatewayConfig] Rename gwLRPJoinIPs to gwRouterJoinCIDRs

7a5bb42

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


          [config] Rename TransitSwitchSUbnet to TransitSubnet

e14c4ed

This subnet is now also used for transit routers in the layer2 topology.

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


          [layer2-router] add logic to define current layer2 topology.

38d92e3

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


          [tunnel-keys] Add tunnel keys allocator to cluster manager.

a04d9c8

Make sure it reserves already allocated ids on startup.

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


          [layer2-router] Set and parse tunnel-keys for layer2 networks

5657fd0

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


          [layer2-router] Add gateway side

40d21f0

Add transit router info to use for layer2 interconnect.

Signed-off-by: Nadia Pinaeva <n.m.pinaeva@gmail.com>
Co-authored-by: Enrique Llorente <ellorent@redhat.com>


          [layer2-router] Add secondary_layer2_controller side

e8cbe68

Signed-off-by: Nadia Pinaeva <n.m.pinaeva@gmail.com>
Co-authored-by: Enrique Llorente <ellorent@redhat.com>


          [layer2-router] Services: put service routes on the transit router

ee49f8c

Signed-off-by: Nadia Pinaeva <n.m.pinaeva@gmail.com>
Co-authored-by: Enrique Llorente <ellorent@redhat.com>


          [layer2-router] add egressIP for new topology.

e48bb67

Signed-off-by: Nadia Pinaeva <n.m.pinaeva@gmail.com>
Co-authored-by: Enrique Llorente <ellorent@redhat.com>


          Upgrade: add cleanup and upgrade topology for local node.

62c8e99

gateway: Remove old GW router to layer2 switch ports together with stale
routes, policies and NATs.
layer2_controller: Create an extra switch to transit router link with
MAC-only router port. Add fake join subnet IPs to the transit router
to switch port.

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


          Upgrade: handle remote node upgrades to the new topology type.

0a2da74

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


          Upgrade: add cleanup when all nodes are upgraded.

7b33cfc

It is only triggered on restart now

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


          [podAnnotation] Use transit router port LLA for pod annotation

0c7459f

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


          [e2e] BGP test: Layer2 UDN behaviour is not similar to Layer3.

c6d3c98

"UDN pod to the same node nodeport service in different UDN network"
test used to work on Layer2 UDN for ipv6 because of the SNAT on the
GR. Now SNAT was moved to the transit router and works the same
way as Layer3 networks.

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


          [layer2-router] Update kubevirt tests to use default GW IP.

de2b7bf

Previously default gateway for layer2 was on the GR, so we had to use
it's primary joinIP to evaluate expected MAC and LLA, now the default
gateway is on the transit router with the first subnet IP.

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


          [mockery] Update version to be compatible with go1.24

810226b

cni/NetNS is replaced with
github.com/containernetworking/plugins/pkg/ns/NetNS
node.ManagementPort was moved to its own package.

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


          [layer2-router] set Layer2UsesTransitRouter to true for unit tests

a761585

Fix unit tests for the introduced changes.

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


          [kind] Add ovnkube-identity to the deployed pods list

0f69bd4

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


          kv: Reconcile transit router as gateway after LM

3e07236

Co-authored-by: Enrique Llorente <ellorent@redhat.com>
Signed-off-by: Nadia Pinaeva <n.m.pinaeva@gmail.com>


          kv: Add join subnet ipv6 pio with lifetime 0

8e8a046

After topology upgrade a new default gateway for layer2
VMs will be on the transit router, so we need to remove
previously learned MAC.

Co-authored-by: Enrique Llorente <ellorent@redhat.com>
Signed-off-by: Nadia Pinaeva <n.m.pinaeva@gmail.com>


          Add transit subnet conflict handling for Layer2 networks.

9ec9340

Add a transitSubnet field similar to joinSubnet to the NetConf,
but only set it for Primary Layer2 networks.
Set transit subnets for NADs

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


          Merge pull request #5527 from ormergi/kv-install-cleanup

6a14fed

kind,kubevirt: Improve installtion flow


          Merge pull request #5561 from npinaeva/layer2-router-upgrade

b59ab1f

Layer2 router upgrade


          NetPol: Process update only when spec fields and/or related annotatio…

9f269e7

…n are updated

Signed-off-by: arkadeepsen <arsen@redhat.com>


          MultiNetPol: Process update only when spec fields and/or related anno…

95bfa38

…tations are updated

Signed-off-by: arkadeepsen <arsen@redhat.com>


          [layer2] Add tunnel key for local port connecting TR with L2 switch.

e2cd826

Use key 1 for transit router to switch port, reserve keys 1-9 for
potential local ports in the future.

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


          Ensure UDN mgmt port is removed

cd821ab

Instead of only trusting OVS to remove the port, also check that it is
removed and remove it via netlink if so. New unit test captures this
behavior as it uses a fexec for OVS, but adds the real interface via
kernel.

Signed-off-by: Tim Rozet <trozet@nvidia.com>

Contributor

jluhrsen commented Oct 27, 2025

@martinkennelly need to override lint pls

/retest

Contributor

asood-rh commented Oct 27, 2025

/test e2e-aws-ovn-fdp-qe

Member

arkadeepsen commented Oct 27, 2025

/retitle OCPBUGS-56749: DownStream Merge [10-24-2025]

openshift-ci bot changed the title ~~NO-JIRA: DownStream Merge [10-24-2025]~~ OCPBUGS-56749: DownStream Merge [10-24-2025]

openshift-ci-robot added jira/severity-critical jira/valid-bug labels

Contributor

openshift-ci-robot commented Oct 27, 2025

@openshift-pr-manager[bot]: This pull request references Jira Issue OCPBUGS-56749, 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 @zhaozhanqi

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

Details

In response to this:

Automated merge of upstream/master → master.

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 bot requested a review from zhaozhanqi

October 27, 2025 05:11

Member

pperiyasamy commented Oct 28, 2025

/retest-required

Contributor

jcaamano commented Oct 28, 2025

/override ci/prow/lint

Contributor

openshift-ci bot commented Oct 28, 2025

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

Details

In response to this:

/override ci/prow/lint

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.

Contributor

jcaamano commented Oct 28, 2025

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

Contributor

openshift-ci bot commented Oct 28, 2025

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

Details

In response to this:

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

Contributor

openshift-ci bot commented Oct 28, 2025 •

edited

Loading

@openshift-pr-manager[bot]: 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/qe-perfscale-aws-ovn-small-udn-density-l3	`46aec45`	link	false	`/test qe-perfscale-aws-ovn-small-udn-density-l3`
ci/prow/security	`46aec45`	link	false	`/test security`
ci/prow/qe-perfscale-aws-ovn-small-udn-density-churn-l3	`46aec45`	link	false	`/test qe-perfscale-aws-ovn-small-udn-density-churn-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.

Member

pperiyasamy commented Oct 28, 2025

The qe-perfscale-payload-control-plane-6nodes is failing at openshift-qe-orion-cluster-density step with below error:

++ echo /logs/artifacts/trt-external-payload-cluster-density.yaml
++ awk -F/ '{print $2}'
++ awk -F. '{print $1}'
+ FILENAME=logs
+ es_metadata_index='perf_scale_ci-*'
+ es_benchmark_index='ripsaw-kube-burner-*'
+ VERSION=4.20
+ jobtype=periodic
+ orion --node-count false --config /logs/artifacts/trt-external-payload-cluster-density.yaml --lookback 15d --hunter-analyze --output-format junit --save-output-path=junit.xml --ack /logs/artifacts/cluster-density_ack.yaml
+ tee /logs/artifacts/logs.txt
2025-10-28 12:36:03,834 - Orion      - INFO - file: main.py - line: 138 - 🏹 Starting Orion in command-line mode
2025-10-28 12:36:03,922 - Orion      - INFO - file: utils.py - line: 653 - Duration to subtract: 15 days, 0:00:00
2025-10-28 12:36:03,922 - Orion      - INFO - file: utils.py - line: 656 - Start timestamp: 2025-10-28 12:36:03.558979+00:00
2025-10-28 12:36:03,922 - Orion      - INFO - file: utils.py - line: 293 - The test payload-cluster-density-v2 has started
2025-10-28 12:36:03,922 - Orion      - INFO - file: utils.py - line: 205 - organization is empty removed from metadata for it to not affect the matching process
2025-10-28 12:36:03,922 - Orion      - INFO - file: utils.py - line: 208 - repository is empty removed from metadata for it to not affect the matching process
2025-10-28 12:36:03,923 - Orion      - INFO - file: matcher.py - line: 74 - Executing query against index: perf_scale_ci-*
2025-10-28 12:36:04,028 - Orion      - INFO - file: matcher.py - line: 74 - Executing query against index: perf_scale_ci-*
2025-10-28 12:36:04,110 - Orion      - INFO - file: utils.py - line: 336 - No UUID present for given metadata
+ orion_exit_status=3
+ set -e
+ cp '*.csv' '*.xml' '*.json' requirements-test.txt requirements.txt /logs/artifacts/
+ true
+ exit 3

seeing VERSION=4.20, not sure if this need version update in the lane. will have to investigate.

Contributor

jtaleric commented Oct 28, 2025

/test qe-perfscale-payload-control-plane-6nodes

anuragthehatter commented Oct 28, 2025

/verified later @zhaozhanqi

openshift-ci-robot added verified-later verified labels

Contributor

openshift-ci-robot commented Oct 28, 2025

@anuragthehatter: This PR has been marked to be verified later by @zhaozhanqi.

Details

In response to this:

/verified later @zhaozhanqi

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.

Contributor

jcaamano commented Oct 28, 2025

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

openshift-ci bot assigned jcaamano

openshift-ci bot added the lgtm label

Contributor

openshift-ci bot commented Oct 28, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcaamano, openshift-pr-manager[bot]

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 bot added the approved label

Contributor

openshift-ci bot commented Oct 28, 2025

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

Details

In response to this:

/lgtm
/approve
/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-merge-bot bot merged commit 7bc6afe into master

30 of 33 checks passed

Contributor

openshift-ci-robot commented Oct 28, 2025

@openshift-pr-manager[bot]: Jira Issue OCPBUGS-56749: All pull requests linked via external trackers have merged:

openshift/ovn-kubernetes#2829

This pull request has the verified-later tag and will need to be manually moved to VERIFIED after testing. Jira Issue OCPBUGS-56749 has been moved to the MODIFIED state.

Details

In response to this:

Automated merge of upstream/master → master.

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.

Contributor

openshift-merge-robot commented Oct 30, 2025

Fix included in accepted release 4.21.0-0.nightly-2025-10-30-060549

jluhrsen mentioned this pull request

OCPBUGS-63686: OVN EIP: improve startup syncer for EIP #2839

Closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved jira/severity-critical jira/valid-bug jira/valid-reference lgtm ok-to-test verified verified-later