Skip to content

[release-4.18] OCPBUGS-64780: kubevirt: fix bad release of IPs of live migratable pods#2847

Merged
openshift-merge-bot[bot] merged 8 commits intoopenshift:release-4.18from
openshift-cherrypick-robot:cherry-pick-2842-to-release-4.18
Nov 12, 2025
Merged

[release-4.18] OCPBUGS-64780: kubevirt: fix bad release of IPs of live migratable pods#2847
openshift-merge-bot[bot] merged 8 commits intoopenshift:release-4.18from
openshift-cherrypick-robot:cherry-pick-2842-to-release-4.18

Conversation

@openshift-cherrypick-robot

This is an automated cherry-pick of #2842

/assign jcaamano

trozet and others added 8 commits November 7, 2025 09:07
When multiple networks support was first added, all controllers that
were added used the label "Secondary" to indicate they were not
"Default". When UDN was added, it allowed "Secondary" networks to
function as the primary network for a pod, creating terminology
confusion. We now treat non-default networks all as "User-Defined
Networks". This commit changes all naming to conform to the latter.

The only places secondary is used now is for distinguishing whether or
not a UDN is acting as a primary or secondary network for a pod (it's
role).

The only exception to this is udn-isolation. I did not touch this
because it relies on dbIDs, which would impact functionality for
upgrade.

There is no functional change in this commit.

Signed-off-by: Tim Rozet <trozet@nvidia.com>
(cherry picked from commit bbca874)
The k8s e2e utility functions AddOrUpdateLabelOnNode/RemoveLabelOffNode
don't work for labels without a value. The incorrect handling of these
labels caused an incorrect sequence of nodes whem migrating different
than what the tests intended to test.

Signed-off-by: Jaime Caamaño Ruiz <jcaamano@redhat.com>
(cherry picked from commit 434b48f)
There's two circumstances when IPs were being released incorrectly:

* when a live migratable pod completed with no migration ongoing it was
  not being released due to IsMigratedSourcePodStale outright assuming a
  completed pod was stale.
* when a live migratable pod completed on a different node than the VM's
  original as part of a migration it was being released when it
  shouldn't, we were simply not checking if it was a migration.

It also improves the tests to check for IP release.

Signed-off-by: Jaime Caamaño Ruiz <jcaamano@redhat.com>
(cherry picked from commit 4c34982)
Don't attempt to release IPs that are not managed by the local zone
which can happen with live migratable pods, otherwise we would get
distracting error logs on release.

Signed-off-by: Jaime Caamaño Ruiz <jcaamano@redhat.com>
(cherry picked from commit 7a155cc)
ConditionalIPRelease would always return false when checking IPs not
tracked in the local zone so in that case we were not correctly checking
for colliding pods.

This was hidden by the fact that IsMigratedSourcePodStale was used just
before instead of AllVMPodsAreCompleted until a very recent fix and that
would always return false for a completed live migratable pod.

Signed-off-by: Jaime Caamaño Ruiz <jcaamano@redhat.com>
(cherry picked from commit 0dc8f27)
Or completion of a failed target pod

Signed-off-by: Jaime Caamaño Ruiz <jcaamano@redhat.com>
(cherry picked from commit c1b02b5)
As it is the most complex scenario and a superset of testing without it

Signed-off-by: Jaime Caamaño Ruiz <jcaamano@redhat.com>
(cherry picked from commit ef92f78)
I accidentally removed the check in recent PR [1] which could have
performance consequences as checking agains other pods has a cost.
Reintroduce the check with a hopefully useful comment to prevent it form
happening again.

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

Signed-off-by: Jaime Caamaño Ruiz <jcaamano@redhat.com>
(cherry picked from commit 76f6439)
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-64645 has been cloned as Jira Issue OCPBUGS-64780. Will retitle bug to link to clone.
/retitle [release-4.18] OCPBUGS-64780: kubevirt: fix bad release of IPs of live migratable pods

Details

In response to this:

This is an automated cherry-pick of #2842

/assign jcaamano

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 changed the title [release-4.18] OCPBUGS-64645: kubevirt: fix bad release of IPs of live migratable pods [release-4.18] OCPBUGS-64780: kubevirt: fix bad release of IPs of live migratable pods Nov 7, 2025
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important 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 Nov 7, 2025
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-64780, which is invalid:

  • expected dependent Jira Issue OCPBUGS-64645 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ON_QA 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:

This is an automated cherry-pick of #2842

/assign jcaamano

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 kyrtapz November 7, 2025 09:07
@jcaamano
Copy link
Contributor

jcaamano commented Nov 7, 2025

/override ci/prow/lint
/override ci/prow/security

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 7, 2025

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

Details

In response to this:

/override ci/prow/lint
/override ci/prow/security

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

jcaamano commented Nov 7, 2025

/retest

1 similar comment
@jluhrsen
Copy link
Contributor

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 11, 2025

@openshift-cherrypick-robot: 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/lint d549068 link true /test lint
ci/prow/security d549068 link false /test security
ci/prow/okd-scos-e2e-aws-ovn d549068 link false /test okd-scos-e2e-aws-ovn

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.

@jcaamano
Copy link
Contributor

/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

@jcaamano: This pull request references Jira Issue OCPBUGS-64780, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.z) matches configured target version for branch (4.18.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-64645 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-64645 targets the "4.19.z" version, which is one of the valid target versions: 4.19.0, 4.19.z
  • bug has dependents

Requesting review from QA contact:
/cc @anuragthehatter

Details

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.

@pperiyasamy
Copy link
Member

/payload 4.18 ci blocking
/payload 4.18 nightly blocking

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 11, 2025

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

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

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/2a12b200-bee2-11f0-94a8-d82cb0be1745-0

trigger 10 job(s) of type blocking for the nightly release of OCP 4.18

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

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/2a12b200-bee2-11f0-94a8-d82cb0be1745-1

@pperiyasamy
Copy link
Member

/payload-job periodic-ci-openshift-release-master-ci-4.18-upgrade-from-stable-4.17-e2e-aws-ovn-upgrade
/payload-job periodic-ci-openshift-release-master-ci-4.18-e2e-gcp-ovn-upgrade
/payload-job periodic-ci-openshift-hypershift-release-4.18-periodics-e2e-aws-ovn
/payload-job periodic-ci-openshift-release-master-ci-4.18-e2e-aws-upgrade-ovn-single-node
/payload-job periodic-ci-openshift-release-master-ci-4.18-upgrade-from-stable-4.17-e2e-gcp-ovn-rt-upgrade
/payload-job periodic-ci-openshift-release-master-nightly-4.18-e2e-metal-ipi-ovn-bm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 11, 2025

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

  • periodic-ci-openshift-release-master-ci-4.18-upgrade-from-stable-4.17-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.18-e2e-gcp-ovn-upgrade
  • periodic-ci-openshift-hypershift-release-4.18-periodics-e2e-aws-ovn
  • periodic-ci-openshift-release-master-ci-4.18-e2e-aws-upgrade-ovn-single-node
  • periodic-ci-openshift-release-master-ci-4.18-upgrade-from-stable-4.17-e2e-gcp-ovn-rt-upgrade
  • periodic-ci-openshift-release-master-nightly-4.18-e2e-metal-ipi-ovn-bm

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/acffd2a0-bf24-11f0-9a41-ad966c049b94-0

@pperiyasamy
Copy link
Member

/payload-job periodic-ci-openshift-release-master-ci-4.18-e2e-gcp-ovn-upgrade
/payload-job periodic-ci-openshift-hypershift-release-4.18-periodics-e2e-aws-ovn
/payload-job periodic-ci-openshift-release-master-ci-4.18-e2e-aws-upgrade-ovn-single-node

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 12, 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.18-e2e-gcp-ovn-upgrade
  • periodic-ci-openshift-hypershift-release-4.18-periodics-e2e-aws-ovn
  • periodic-ci-openshift-release-master-ci-4.18-e2e-aws-upgrade-ovn-single-node

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/39e1c270-bfc3-11f0-9244-5e7330158f0c-0

@pperiyasamy
Copy link
Member

/lgtm

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

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

openshift-ci bot commented Nov 12, 2025

[APPROVALNOTIFIER] This PR is APPROVED

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

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 Nov 12, 2025
@anuragthehatter
Copy link

/verified by @anuragthehatter

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

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

Details

In response to this:

/verified by @anuragthehatter

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-bot openshift-merge-bot bot merged commit 672e10d into openshift:release-4.18 Nov 12, 2025
25 of 26 checks passed
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Jira Issue Verification Checks: Jira Issue OCPBUGS-64780
✔️ 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-64780 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:

This is an automated cherry-pick of #2842

/assign jcaamano

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.

@jcaamano
Copy link
Contributor

/cherry-pick release-4.17

@openshift-cherrypick-robot
Copy link
Author

@jcaamano: #2847 failed to apply on top of branch "release-4.17":

Applying: Fix naming of "Secondary" to be "User-Defined"
Using index info to reconstruct a base tree...
M	go-controller/pkg/allocator/pod/pod_annotation.go
M	go-controller/pkg/clustermanager/clustermanager.go
M	go-controller/pkg/clustermanager/network_cluster_controller.go
M	go-controller/pkg/clustermanager/node/node_allocator.go
M	go-controller/pkg/clustermanager/secondary_network_cluster_manager.go
M	go-controller/pkg/clustermanager/secondary_network_unit_test.go
M	go-controller/pkg/cni/helper_linux.go
M	go-controller/pkg/cni/types.go
M	go-controller/pkg/cni/utils.go
A	go-controller/pkg/controllermanager/controller_manager.go
A	go-controller/pkg/controllermanager/node_controller_manager.go
M	go-controller/pkg/metrics/ovnkube_controller.go
M	go-controller/pkg/node/base_node_network_controller_dpu.go
M	go-controller/pkg/node/controllers/egressip/egressip.go
M	go-controller/pkg/node/default_node_network_controller.go
M	go-controller/pkg/node/secondary_node_network_controller.go
M	go-controller/pkg/node/secondary_node_network_controller_test.go
M	go-controller/pkg/ovn/base_network_controller.go
M	go-controller/pkg/ovn/base_network_controller_multicast.go
M	go-controller/pkg/ovn/base_network_controller_multipolicy.go
M	go-controller/pkg/ovn/base_network_controller_namespace.go
M	go-controller/pkg/ovn/base_network_controller_pods.go
M	go-controller/pkg/ovn/base_network_controller_policy.go
M	go-controller/pkg/ovn/base_network_controller_secondary.go
M	go-controller/pkg/ovn/base_network_controller_secondary_test.go
M	go-controller/pkg/ovn/base_secondary_layer2_network_controller.go
M	go-controller/pkg/ovn/controller/admin_network_policy/admin_network_policy_controller.go
A	go-controller/pkg/ovn/controller/network_qos/network_qos.go
A	go-controller/pkg/ovn/controller/network_qos/network_qos_ovnnb.go
A	go-controller/pkg/ovn/controller/network_qos/network_qos_test.go
M	go-controller/pkg/ovn/egressip.go
A	go-controller/pkg/ovn/egressip_udn_l2_test.go
A	go-controller/pkg/ovn/egressip_udn_l3_test.go
A	go-controller/pkg/ovn/external_ids_syncer/logical_router_policy/logical_router_policy_sync.go
A	go-controller/pkg/ovn/external_ids_syncer/nat/nat_sync.go
M	go-controller/pkg/ovn/gateway.go
M	go-controller/pkg/ovn/gatewayrouter/policybasedroutes.go
M	go-controller/pkg/ovn/gatewayrouter/policybasedroutes_test.go
M	go-controller/pkg/ovn/multicast_test.go
M	go-controller/pkg/ovn/multihoming_test.go
M	go-controller/pkg/ovn/multipolicy_test.go
M	go-controller/pkg/ovn/ovn_test.go
M	go-controller/pkg/ovn/pods_test.go
M	go-controller/pkg/ovn/port_cache.go
M	go-controller/pkg/ovn/secondary_layer2_network_controller.go
M	go-controller/pkg/ovn/secondary_layer2_network_controller_test.go
M	go-controller/pkg/ovn/secondary_layer3_network_controller.go
M	go-controller/pkg/ovn/secondary_layer3_network_controller_test.go
M	go-controller/pkg/ovn/secondary_localnet_network_controller.go
M	go-controller/pkg/ovn/topology/topologyfactory.go
M	go-controller/pkg/ovn/zone_interconnect/zone_ic_handler.go
M	go-controller/pkg/ovn/zone_interconnect/zone_ic_handler_test.go
M	go-controller/pkg/types/const.go
A	go-controller/pkg/util/mocks/multinetwork/NetInfo.go
M	go-controller/pkg/util/multi_network.go
M	go-controller/pkg/util/multi_network_test.go
M	go-controller/pkg/util/pod_annotation.go
M	go-controller/pkg/util/util.go
Falling back to patching base and 3-way merge...
Auto-merging go-controller/pkg/util/util.go
CONFLICT (content): Merge conflict in go-controller/pkg/util/util.go
Auto-merging go-controller/pkg/util/pod_annotation.go
CONFLICT (content): Merge conflict in go-controller/pkg/util/pod_annotation.go
Auto-merging go-controller/pkg/util/multi_network_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/util/multi_network_test.go
Auto-merging go-controller/pkg/util/multi_network.go
CONFLICT (content): Merge conflict in go-controller/pkg/util/multi_network.go
CONFLICT (modify/delete): go-controller/pkg/util/mocks/multinetwork/NetInfo.go deleted in HEAD and modified in Fix naming of "Secondary" to be "User-Defined". Version Fix naming of "Secondary" to be "User-Defined" of go-controller/pkg/util/mocks/multinetwork/NetInfo.go left in tree.
Auto-merging go-controller/pkg/types/const.go
CONFLICT (content): Merge conflict in go-controller/pkg/types/const.go
Auto-merging go-controller/pkg/ovn/zone_interconnect/zone_ic_handler_test.go
Auto-merging go-controller/pkg/ovn/zone_interconnect/zone_ic_handler.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/zone_interconnect/zone_ic_handler.go
Auto-merging go-controller/pkg/ovn/topology/topologyfactory.go
Auto-merging go-controller/pkg/ovn/port_cache.go
Auto-merging go-controller/pkg/ovn/pods_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/pods_test.go
Auto-merging go-controller/pkg/ovn/ovn_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/ovn_test.go
Auto-merging go-controller/pkg/ovn/multipolicy_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/multipolicy_test.go
Auto-merging go-controller/pkg/ovn/multihoming_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/multihoming_test.go
Auto-merging go-controller/pkg/ovn/multicast_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/multicast_test.go
Auto-merging go-controller/pkg/ovn/localnet_user_defined_network_controller.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/localnet_user_defined_network_controller.go
Auto-merging go-controller/pkg/ovn/layer3_user_defined_network_controller_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/layer3_user_defined_network_controller_test.go
Auto-merging go-controller/pkg/ovn/layer3_user_defined_network_controller.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/layer3_user_defined_network_controller.go
Auto-merging go-controller/pkg/ovn/layer2_user_defined_network_controller_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/layer2_user_defined_network_controller_test.go
Auto-merging go-controller/pkg/ovn/layer2_user_defined_network_controller.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/layer2_user_defined_network_controller.go
Auto-merging go-controller/pkg/ovn/gatewayrouter/policybasedroutes_test.go
Auto-merging go-controller/pkg/ovn/gatewayrouter/policybasedroutes.go
Auto-merging go-controller/pkg/ovn/gateway.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/gateway.go
CONFLICT (modify/delete): go-controller/pkg/ovn/external_ids_syncer/nat/nat_sync.go deleted in HEAD and modified in Fix naming of "Secondary" to be "User-Defined". Version Fix naming of "Secondary" to be "User-Defined" of go-controller/pkg/ovn/external_ids_syncer/nat/nat_sync.go left in tree.
CONFLICT (modify/delete): go-controller/pkg/ovn/external_ids_syncer/logical_router_policy/logical_router_policy_sync.go deleted in HEAD and modified in Fix naming of "Secondary" to be "User-Defined". Version Fix naming of "Secondary" to be "User-Defined" of go-controller/pkg/ovn/external_ids_syncer/logical_router_policy/logical_router_policy_sync.go left in tree.
CONFLICT (modify/delete): go-controller/pkg/ovn/egressip_udn_l3_test.go deleted in HEAD and modified in Fix naming of "Secondary" to be "User-Defined". Version Fix naming of "Secondary" to be "User-Defined" of go-controller/pkg/ovn/egressip_udn_l3_test.go left in tree.
CONFLICT (modify/delete): go-controller/pkg/ovn/egressip_udn_l2_test.go deleted in HEAD and modified in Fix naming of "Secondary" to be "User-Defined". Version Fix naming of "Secondary" to be "User-Defined" of go-controller/pkg/ovn/egressip_udn_l2_test.go left in tree.
Auto-merging go-controller/pkg/ovn/egressip.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/egressip.go
CONFLICT (modify/delete): go-controller/pkg/ovn/controller/network_qos/network_qos_test.go deleted in HEAD and modified in Fix naming of "Secondary" to be "User-Defined". Version Fix naming of "Secondary" to be "User-Defined" of go-controller/pkg/ovn/controller/network_qos/network_qos_test.go left in tree.
CONFLICT (modify/delete): go-controller/pkg/ovn/controller/network_qos/network_qos_ovnnb.go deleted in HEAD and modified in Fix naming of "Secondary" to be "User-Defined". Version Fix naming of "Secondary" to be "User-Defined" of go-controller/pkg/ovn/controller/network_qos/network_qos_ovnnb.go left in tree.
CONFLICT (modify/delete): go-controller/pkg/ovn/controller/network_qos/network_qos.go deleted in HEAD and modified in Fix naming of "Secondary" to be "User-Defined". Version Fix naming of "Secondary" to be "User-Defined" of go-controller/pkg/ovn/controller/network_qos/network_qos.go left in tree.
Auto-merging go-controller/pkg/ovn/controller/admin_network_policy/admin_network_policy_controller.go
Auto-merging go-controller/pkg/ovn/base_secondary_layer2_network_controller.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/base_secondary_layer2_network_controller.go
Auto-merging go-controller/pkg/ovn/base_network_controller_user_defined_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/base_network_controller_user_defined_test.go
Auto-merging go-controller/pkg/ovn/base_network_controller_user_defined.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/base_network_controller_user_defined.go
Auto-merging go-controller/pkg/ovn/base_network_controller_policy.go
Auto-merging go-controller/pkg/ovn/base_network_controller_pods.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/base_network_controller_pods.go
Auto-merging go-controller/pkg/ovn/base_network_controller_namespace.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/base_network_controller_namespace.go
Auto-merging go-controller/pkg/ovn/base_network_controller_multipolicy.go
Auto-merging go-controller/pkg/ovn/base_network_controller_multicast.go
Auto-merging go-controller/pkg/ovn/base_network_controller.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/base_network_controller.go
Auto-merging go-controller/pkg/node/user_defined_node_network_controller_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/node/user_defined_node_network_controller_test.go
Auto-merging go-controller/pkg/node/user_defined_node_network_controller.go
CONFLICT (content): Merge conflict in go-controller/pkg/node/user_defined_node_network_controller.go
Auto-merging go-controller/pkg/node/default_node_network_controller.go
CONFLICT (content): Merge conflict in go-controller/pkg/node/default_node_network_controller.go
Auto-merging go-controller/pkg/node/controllers/egressip/egressip.go
CONFLICT (content): Merge conflict in go-controller/pkg/node/controllers/egressip/egressip.go
Auto-merging go-controller/pkg/node/base_node_network_controller_dpu.go
CONFLICT (content): Merge conflict in go-controller/pkg/node/base_node_network_controller_dpu.go
Auto-merging go-controller/pkg/network-controller-manager/node_network_controller_manager.go
CONFLICT (content): Merge conflict in go-controller/pkg/network-controller-manager/node_network_controller_manager.go
Auto-merging go-controller/pkg/network-controller-manager/network_controller_manager.go
CONFLICT (content): Merge conflict in go-controller/pkg/network-controller-manager/network_controller_manager.go
Auto-merging go-controller/pkg/metrics/ovnkube_controller.go
CONFLICT (content): Merge conflict in go-controller/pkg/metrics/ovnkube_controller.go
Auto-merging go-controller/pkg/cni/utils.go
Auto-merging go-controller/pkg/cni/types.go
Auto-merging go-controller/pkg/cni/helper_linux.go
Auto-merging go-controller/pkg/clustermanager/user_defined_network_unit_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/clustermanager/user_defined_network_unit_test.go
Auto-merging go-controller/pkg/clustermanager/user_defined_network_cluster_manager.go
CONFLICT (content): Merge conflict in go-controller/pkg/clustermanager/user_defined_network_cluster_manager.go
Auto-merging go-controller/pkg/clustermanager/node/node_allocator.go
Auto-merging go-controller/pkg/clustermanager/network_cluster_controller.go
Auto-merging go-controller/pkg/clustermanager/clustermanager.go
CONFLICT (content): Merge conflict in go-controller/pkg/clustermanager/clustermanager.go
Auto-merging go-controller/pkg/allocator/pod/pod_annotation.go
CONFLICT (content): Merge conflict in go-controller/pkg/allocator/pod/pod_annotation.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Fix naming of "Secondary" to be "User-Defined"

Details

In response to this:

/cherry-pick release-4.17

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

Fix included in accepted release 4.18.0-0.nightly-2025-11-13-035140

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-important Referenced Jira bug's severity is important 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.