[release-4.18] OCPBUGS-48710: DownStream Merge Sync from 4.19 [01-29-2025] #2430
Conversation
Compare annotations directly if possible. For network specific map entries only compare raw json entries without parsing the map in full. Co-authored-by: Tim Rozet <trozet@redhat.com> Signed-off-by: Patryk Diak <pdiak@redhat.com>
Instead of always parsing all node/join subnets parse the raw json map and only compute the results for the affected network. Signed-off-by: Patryk Diak <pdiak@redhat.com>
Signed-off-by: Patryk Diak <pdiak@redhat.com>
Secondary network controllers should ingore resources that do not belong to the current network. Signed-off-by: Patryk Diak <pdiak@redhat.com>
GetActiveNetworkForNamespace was being called in controllers that are secondary UDN only. There is no reason to do this, and can cause problems when a secondary NAD is being used by several namespaces, networks. Additionally, GetNetworkRole function is flawed with a note that says do not call this function if a pod is not related to the network controller. If a primary controller (not default) was to call GetNetworkRole on a pod that doesn't belong to it, it would unintentionally return the role as Secondary. This is not possible and we should panic in this case. This will enforce the comment that GetNetworkRole should not be called on a pod that has no network on this controller. Signed-off-by: Tim Rozet <trozet@redhat.com>
The code for default controller was checking if the role of the controller on the pod was not primary. Really it should check if the role is infrastructure-locked. That means there is a primary UDN and the default controller should open ports. Signed-off-by: Tim Rozet <trozet@redhat.com>
Services should not be started on a secondary UDN/NAD controller. Multinetpol should not be started on a primary UDN controller. Signed-off-by: Tim Rozet <trozet@redhat.com>
Order of status may not always be predictable. Allow for it. Signed-off-by: Tim Rozet <trozet@redhat.com>
|
@openshift-cherrypick-robot: Ignoring requests to cherry-pick non-bug issues: SDN-4930 DetailsIn response to this:
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. |
|
extra tests... /test e2e-metal-ipi-ovn-ipv6-techpreview also, let's get a look at payload jobs: /payload 4.18 ci blocking |
|
@jluhrsen: trigger 4 job(s) of type blocking for the ci release of OCP 4.18
See details on https://pr-payload-tests.ci.openshift.org/runs/ci/fff053f0-df2c-11ef-902f-2d5b760fa4c6-0 trigger 13 job(s) of type blocking for the nightly release of OCP 4.18
See details on https://pr-payload-tests.ci.openshift.org/runs/ci/fff053f0-df2c-11ef-902f-2d5b760fa4c6-1 |
|
/retitle [release-4.18] OCPBUGS-48710: DownStream Merge Sync from 4.19 [01-29-2025] |
openshift-ci
bot
changed the title
openshift-ci-robot
added
jira/valid-reference
|
@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-48710, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn response to this:
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. |
|
/jira refresh |
|
/label backport-risk-assessed |
openshift-ci
bot
added
the
backport-risk-assessed
openshift-ci
bot
assigned
anuragthehatter,
asood-rh,
huiran0826,
jechen0648 and
mffiedler
|
/approve |
openshift-ci-robot
added
the
jira/valid-bug
|
/override ci/prow/e2e-aws-ovn-upgrade |
|
@trozet: Overrode contexts on behalf of trozet: ci/prow/e2e-aws-ovn-upgrade DetailsIn response to this:
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. |
|
/override ci/prow/4.18-upgrade-from-stable-4.17-e2e-aws-ovn-upgrade |
|
/override ci/prow/4.18-upgrade-from-stable-4.17-e2e-gcp-ovn-rt-upgrade |
|
@trozet: Overrode contexts on behalf of trozet: ci/prow/4.18-upgrade-from-stable-4.17-e2e-aws-ovn-upgrade DetailsIn response to this:
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. |
|
@trozet: Overrode contexts on behalf of trozet: ci/prow/4.18-upgrade-from-stable-4.17-e2e-gcp-ovn-rt-upgrade DetailsIn response to this:
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. |
|
/override ci/prow/e2e-aws-ovn-serial |
|
@trozet: Overrode contexts on behalf of trozet: ci/prow/e2e-aws-ovn-serial DetailsIn response to this:
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. |
|
Azure etcd failure /override ci/prow/e2e-azure-ovn-upgrade |
|
@trozet: Overrode contexts on behalf of trozet: ci/prow/e2e-azure-ovn-upgrade DetailsIn response to this:
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. |
|
/hold cancel |
openshift-ci
bot
removed
the
do-not-merge/hold
|
/override ci/prow/e2e-aws-ovn-local-to-shared-gateway-mode-migration |
|
@trozet: Overrode contexts on behalf of trozet: ci/prow/e2e-aws-ovn-local-to-shared-gateway-mode-migration, ci/prow/e2e-aws-ovn-shared-to-local-gateway-mode-migration, ci/prow/e2e-aws-ovn-windows DetailsIn response to this:
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. |
|
/tide refresh |
openshift-merge-bot
bot
merged commit 9f68300
into
openshift:release-4.18
|
@openshift-cherrypick-robot: Jira Issue OCPBUGS-48710: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-48710 has been moved to the MODIFIED state. DetailsIn response to this:
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-cherrypick-robot: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
|
[ART PR BUILD NOTIFIER] Distgit: ovn-kubernetes-base |
|
[ART PR BUILD NOTIFIER] Distgit: ovn-kubernetes-microshift |
|
[ART PR BUILD NOTIFIER] Distgit: ose-ovn-kubernetes |
|
Fix included in accepted release 4.18.0-0.nightly-2025-06-26-034047 |
|
Fix included in accepted release 4.18.0-0.nightly-2025-10-23-005402 |
|
Fix included in accepted release 4.18.0-0.nightly-2025-12-24-222251 |
17 participants
This is an automated cherry-pick of #2429
/assign jluhrsen