Skip to content

Conversation

@jluhrsen
Copy link
Contributor

@jluhrsen jluhrsen commented May 28, 2025

this is a git merge -X theirs release-4.19 which contains 69 duplicate commits that came in to release-4.18 with cherry-picks.

❯ git log -n1000 --pretty=format:"%s" | sort | uniq -c | awk '$1>1' | wc -l
69
❯ git --no-pager log -n1000 --pretty=format:"%s" | sort | uniq -d | while IFS= read -r msg; do
echo "DUP: $msg"
git --no-pager log -n300 --grep="$(printf '%s\n' "$msg" | sed 's/[]/$*.^[]/&/g')" --pretty=format:"%h " | sed 's/ $/\n/'
echo "-----"
done
DUP: Add e2e test to validate that egressfirewall supports DNS name in caps
9e4907d46

7888d9556

7739a8476
-----
DUP: Add network name conflict e2e
0a3d0ca26

45944ef4e
-----
DUP: Add some more ExpectNoError checks to the e2e tests
1a9ba9a71

0e86ace53

e7b36a0b3
-----
DUP: Add universal NetworkSelector API
58e5d3fb3

2d647a2cb

3bb6054af
-----
DUP: Bump OVN to 24.09.2-14 for FDP-1131
b8daef72d

32f95108f

831ee6e43

976a3c6a9
-----
DUP: Bump OVN to ovn24.09-24.09.1-10.el9fdp
b41a3aba0

db07151cf

fcf25ea44

41eaacfad
-----
DUP: Bump OVS version to 3.4.0-18
31f76ecfb

1bc93172b
-----
DUP: Change dynamic_neigh_routers to false for the Interconnect topology.
4e4539eac

95efb11a6

c07163ed3
-----
DUP: change slack url to point to the cloud-native workspace
09070997f

c7c7b7d07

123d692df
-----
DUP: Check if cluster manager controller has retry pod framework
51322a056

4e18d5bb3

3af5ebbc7
-----
DUP: Clone frrFactory in ShallowClone
42ecd7a6f

f40960940

21cbc5da0
-----
DUP: Clone raFactory in ShallowClone
9be70caa3

61534bd94

b65a54753
-----
DUP: crd, cudn: Ensure matching toplogy and topology-config
1dc966b14

96b879864
-----
DUP: docs/multi-homing: Refactor to meet org template
db6e142b3

57c979b8f
-----
DUP: docs/multi-network-policies: Refactor to meet org template
1629b3eaa

dd3ffe6af
-----
DUP: Do not get active network for non-primary controllers
fb74e44f7

1234953a6
-----
DUP: e2e, kubevirt, UDN: Add failed lm test for l2 pudn
5433730bb

dd96d1263
-----
DUP: e2e, kubevirt, UDN: Add north south traffic test
6ab1f31de

f7ce763c7
-----
DUP: e2e, kubevirt, UDN: Check e/w tcp not broken after LM
217698ec5

a95f2a8b3
-----
DUP: e2e, kubevirt, UDN: Check migration with snat-per-pod
0c8610c0c

c9ff16e5e
-----
DUP: e2e, kubevirt, UDN: Check n/s egress not broken after LM
02735574c

d2922db70
-----
DUP: e2e, kubevirt, UDN: Check n/s tcp not broken after LM
db909a87f

0e69eb928
-----
DUP: e2e, kubevirt, UDN: Increase VM's memory
3115bae10

ad9391f96
-----
DUP: e2e, kubevirt, UDN: Use fedora and iperf
43c6087d8

a91e2b2e8
-----
DUP: EIP no reroute: allow multiple entries for pod to pod and pod to join
09261dc5c

33dcc93d3

27033e321
-----
DUP: Enrich CNI request pod UID error with the mismatched UIDs
d10321d99

6525e7e00

2d91da3d8
-----
DUP: factory/handler: avoid deadlock on shutdown.
7ae438c21

2458e3de4

b5163625a
-----
DUP: factory: Set default event queue size to 100.
116f7faa8

9e0f380f6

ea4d8a651
-----
DUP: Fix CM-EIP controller flake
ee2031167

8973f8e20
-----
DUP: Fix conflicting network prefix for (C)UDNs.
dad8daca7

6da0e6e96

6dc458cb7
-----
DUP: Fix CUDN unit test for status matching
b3fc2c91d

5f65e69a0
-----
DUP: Fix egress IP tests
253025a4c

81449ddde
-----
DUP: Fix EIP UT Flake: Don't delete the node on which pod lives
1b3313c6b

a31f477e0

e0c624543
-----
DUP: Fixes 1 minute delay for primary UDN controllers to start
2a8db0976

12cb69b57

3fbbc5b1f
-----
DUP: Fixes starting services/multinetpolicy on wrong controllers
65bc5c82e

73783c2b0
-----
DUP: Fix Kind IPV6 deplyoment with RUN_IN_CONTAINER
6b21a4046

ce6188499
-----
DUP: Fix some nftables checking in the unit tests
fc5d9373c

500dd720b
-----
DUP: Fix UDN and CUDN subnet validation
97e762bc4

eb3eeeba5

a2cbe9d27
-----
DUP: Get the network ID from the NAD for zone/node ctrls
67203d35e

c496a4423
-----
DUP: Handles unspecified protocol in network policy port
bc7e86e46

c0e366777

66c768f0b
-----
DUP: helm: Update documentation for ic and non-ic deployments
74dfde8cb

c79433ff4
-----
DUP: Improve annotation changes detection
bd18b0f04

13814c88a
-----
DUP: Improves multiplexed internal informer performance
faec7a095

0e48baff0
-----
DUP: kubevirt, e2e: Check ipv4 gateway mac after lm
a2599d7c1

0a79dabfd
-----
DUP: kubevirt: Function to reconcile IPv4 gateway mac
173215e6a

4ab5dfef5
-----
DUP: kv, e2e: Keep underlay with delete-namespace=false
7eea9195f

7e5ad64da
-----
DUP: kv, e2e, localnet: Activate tests
6a69eebc3

b08bd371c
-----
DUP: kv, e2e: Reduce live migration disruption treshold
04e3dba6b

d40191e1a
-----
DUP: kv, localnet: Swich LSP Enabled field on migration
836528282

afb4549fc
-----
DUP: kv, udn: Remove addresses when we disable LSP
cc55a58e4

62624ab7c
-----
DUP: Make dbus controller more efficient
9c2fbb186

bd5fff3a4

d59d69c82
-----
DUP: Make open default ports semantically correct
b842cd58e

ce13e95c0
-----
DUP: Merge remote-tracking branch 'origin/master' into merge-10-8-24
c6a0243e6

69781a1d7
-----
DUP: Merge remote-tracking branch 'ovn-org/master' into merge-11-15-24
fb4e12bcc

c2865df7c

74c08160d
-----
DUP: observability-lib/model: reduce dependencies by duplicating constants
18089e08e

9cce8ee50

60b5ebb41
-----
DUP: pin libreswan to 4.6-3.el9_0.3
5fda1fe22

776e76a0e

97a2e6b7e

7fa336012
-----
DUP: Reconcile pending pods when a NAD is added to an existing network
5cd56cfb9

8dd9eb349

73208692d
-----
DUP: Reimplement e2epod.DeletePodWithWait to correctly handle pods that get restarted.
a1f8c2bc1

1dc62cb6a
-----
DUP: Replace ovn-org with ovn-kubernetes to reflect repo move
18c95642f

b60587ad2

ccc391397
-----
DUP: Revert "hard code disable-udn-host-isolation to "true""
34411135a

d108b05b6
-----
DUP: Reverts 49e141a0a41793f94750a8bc998af05b7033dd91
877ed9b2d

adfa997fc
-----
DUP: RouteAdvertisements: switch label selectors to standard convention
2af5f56b8

d5e382072

23a9876e2
-----
DUP: RouteAdvertisements: update API to use universal NetworkSelector
65188addd

c177b355d

396ad2c45
-----
DUP: Slightly fix UDN local gateway masquerade rules (and unit tests)
be77a99ee

d59150a39
-----
DUP: test/e2e, go.mod: run go mod tidy
904b5b36a

47a12af81
-----
DUP: Update OVN to FDP25.A.1 24.09.2-41.
4af08abc3

65fe1aea9

9c4499b0b
-----
DUP: update requirements.txt to use minify-html
004855d40

f607624a7

817186b64
-----
DUP: Use partial parsing for network sepcific CIDRs
c36138096

f13b24494
-----
DUP: UserDefinedNetworks: Ignore pods and namespaces from different networks
bc37ea98b

715675c81
-----

AOS Automation Release Team and others added 30 commits December 6, 2024 01:15
This picks up the following relevant bug fixes:
https://issues.redhat.com/browse/FDP-906
"ovn-controller: lib/ovsdb-idl.c:3596: assertion row->new_datum != NULL failed in ovsdb_idl_txn_write__()"
  6448f5e364 pinctrl: Skip non-local mac bindings in run_buffered_binding().
  ea35347320 pinctrl: Skip deleted mac bindings in run_buffered_binding().
  33a6ae53f4 pinctrl: Use correct map size in pinctrl_handle_put_fdb().
  8eaa7d5991 controller: Fix "use after free" issue in statctrl_run().
  8579859f51 mac-cache: Properly handle deletion of SB mac_bindings.

https://issues.redhat.com/browse/FDP-752
"ovn-northd IPAM incorrectly reports duplicate IP when part of excluded_ips"
  2a24b03f7f ipam: Do not report error for static assigned IPs.

https://issues.redhat.com/browse/FDP-786
"When an ECMP symmetric route is removed, northd removes all logical flows from SBDB for ECMP"
  7b00627433 northd: Respect --ecmp-symmetric-reply for single routes.

Signed-off-by: Dumitru Ceara <dceara@redhat.com>
OCPBUGS-42707: Bump OVN to ovn24.09-24.09.1-10.el9fdp
OCPBUGS-48330,OCPBUGS-42609,OCPBUGS-46585,SDN-4930: Downstream Merge [01-23-2025]
Fixes NPE seen at:
openshift#2427 (comment)

Certain network types may not have a pod handler or retry framework for
cluster manager.

Signed-off-by: Tim Rozet <trozet@redhat.com>
SDN-4930: Downstream Merge [01-28-2025]
SDN-4930: [DownstreamMerge] 1-29-25
OCPBUGS-49727, OCPBUGS-49621: [DownstreamMerge] 1-31-25
Signed-off-by: Aniket Bhat <anbhat@redhat.com>
OCPBUGS-45893: [DownstreamMerge] 2-4-25
…openshift-4.19-ovn-kubernetes-microshift

OCPBUGS-45745: Updating ovn-kubernetes-microshift-container image to be consistent with ART for 4.19
OCPBUGS-45469, OCPBUGS-49337: [DownstreamMerge] 2-6-25
OCPBUGS-49840: Bump OVN to 24.09.2-14 for FDP-1131
OCPBUGS-49933,OCPBUGS-49613: Downstream Merge 7th Feb 2025
OCPBUGS-49598, OCPBUGS-49393: [DownstreamMerge] 13 feb 2025
OCPBUGS-48781: [DownstreamMerge] 2-27-25
Signed-off-by: Zenghui Shi <zshi@redhat.com>
Signed-off-by: aztecher <mikiyaf.business@gmail.com>
@abhat
Copy link
Contributor

abhat commented Jun 25, 2025

[ci/prow/4.20-upgrade-from-stable-4.19-images

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 25, 2025

@abhat: Overrode contexts on behalf of abhat: ci/prow/4.20-upgrade-from-stable-4.19-e2e-gcp-ovn-rt-upgrade

Details

In response to this:

/override ci/prow/4.20-upgrade-from-stable-4.19-e2e-gcp-ovn-rt-upgrade

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.

@tssurya
Copy link
Contributor

tssurya commented Jun 25, 2025

/override ci/prow/4.20-upgrade-from-stable-4.19-images

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 25, 2025

@tssurya: Overrode contexts on behalf of tssurya: ci/prow/4.20-upgrade-from-stable-4.19-images

Details

In response to this:

/override ci/prow/4.20-upgrade-from-stable-4.19-images

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.

@asood-rh
Copy link
Contributor

I think there is enough LGTM's here for me to add the risk-assessed label and get this in. I was hoping to not do this during shift week to avoid any potential issues but based on what @sdodson said above, we can get it in instead of waiting till next week to land the OVS bumps.

Risk-assessment for backport:

  1. I see a slight risk for backport because this is the first PR where we are bringing in the backport of the Kube Rebase from 4.19 to 4.18. Thanks to ART team for taking care of the golan version. However despite this risk CI is green and that's all the signal we can get. @jluhrsen if possible please keep an eye on the next two payloads that release after this lands to ensure they are green.
  2. Besides kube rebase I guess we are bumping swan to 5.2 here? @pperiyasamy whatever is the unpinned version in 4.18 which means the scale regression will be introduced in 4.18 as well? Any other IPSEC bugs?
  3. OVN bump as well but fdp lane was run and is green - again that's the best signal we can get
  4. Bringing in two new features: localnet API and BGP which are turned off in 4.18 actually and have 0 tests from QE side on 4.18 FYI @asood-rh : localnet is not behind a feature gate though BGP is - please do some regression tests for localnet feature or perhaps copy your automation tests to also run on 4.18 post this change - though its not officially supported on front facing docs - we just need to make sure we don't have regressions

Regardless the CI is fully green on all required jobs and that's the best we can do, acknowledging the above risks, adding the label since we need to get all the bug fixes landed into 4.18.

@tssurya The localnet API ( CUDN API with localnet support, UDN does not support Localnet in 4.19 ) is blocked on 4.18 so we do not need to run 4.19 tests against it. If we plan to support Localnet in 4.18 we should have an epic to track it.

4.18 just had a localnet on default network exposed through NAD.

The user gets a message for it as unsupported value in 4.18 for CUDN.

The ClusterUserDefinedNetwork "sec-localnet-net" is invalid: 
* spec.network.topology: Unsupported value: "Localnet": supported values: "Layer2", "Layer3"
* : Invalid value: "null": some validation rules were not checked because the object was invalid; correct the existing errors to complete validatio

As for BGP regression is underway and will update the results.

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD aeea339 and 2 for PR HEAD cc1f69f in total

@sdodson
Copy link
Member

sdodson commented Jun 25, 2025

/override ci/prow/e2e-aws-ovn-edge-zones

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 25, 2025

@sdodson: Overrode contexts on behalf of sdodson: ci/prow/e2e-aws-ovn-edge-zones

Details

In response to this:

/override ci/prow/e2e-aws-ovn-edge-zones

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

openshift-ci bot commented Jun 25, 2025

@jluhrsen: The following test 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-aws-ovn-edge-zones cc1f69f link true /test e2e-aws-ovn-edge-zones

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.

@openshift-merge-bot openshift-merge-bot bot merged commit be9ebb4 into openshift:release-4.18 Jun 25, 2025
49 checks passed
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jun 25, 2025

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

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

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

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

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

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

Details

In response to this:

this is a git merge -X theirs release-4.19 which contains 69 duplicate commits that came in to release-4.18 with cherry-picks.

❯ git log -n1000 --pretty=format:"%s" | sort | uniq -c | awk '$1>1' | wc -l
69
❯ git --no-pager log -n1000 --pretty=format:"%s" | sort | uniq -d | while IFS= read -r msg; do
echo "DUP: $msg"
git --no-pager log -n300 --grep="$(printf '%s\n' "$msg" | sed 's/[]/$*.^[]/&/g')" --pretty=format:"%h " | sed 's/ $/\n/'
echo "-----"
done
DUP: Add e2e test to validate that egressfirewall supports DNS name in caps
9e4907d46

7888d9556

7739a8476
-----
DUP: Add network name conflict e2e
0a3d0ca26

45944ef4e
-----
DUP: Add some more ExpectNoError checks to the e2e tests
1a9ba9a71

0e86ace53

e7b36a0b3
-----
DUP: Add universal NetworkSelector API
58e5d3fb3

2d647a2cb

3bb6054af
-----
DUP: Bump OVN to 24.09.2-14 for [FDP-1131](https://issues.redhat.com//browse/FDP-1131)
b8daef72d

32f95108f

831ee6e43

976a3c6a9
-----
DUP: Bump OVN to ovn24.09-24.09.1-10.el9fdp
b41a3aba0

db07151cf

fcf25ea44

41eaacfad
-----
DUP: Bump OVS version to 3.4.0-18
31f76ecfb

1bc93172b
-----
DUP: Change dynamic_neigh_routers to false for the Interconnect topology.
4e4539eac

95efb11a6

c07163ed3
-----
DUP: change slack url to point to the cloud-native workspace
09070997f

c7c7b7d07

123d692df
-----
DUP: Check if cluster manager controller has retry pod framework
51322a056

4e18d5bb3

3af5ebbc7
-----
DUP: Clone frrFactory in ShallowClone
42ecd7a6f

f40960940

21cbc5da0
-----
DUP: Clone raFactory in ShallowClone
9be70caa3

61534bd94

b65a54753
-----
DUP: crd, cudn: Ensure matching toplogy and topology-config
1dc966b14

96b879864
-----
DUP: docs/multi-homing: Refactor to meet org template
db6e142b3

57c979b8f
-----
DUP: docs/multi-network-policies: Refactor to meet org template
1629b3eaa

dd3ffe6af
-----
DUP: Do not get active network for non-primary controllers
fb74e44f7

1234953a6
-----
DUP: e2e, kubevirt, UDN: Add failed lm test for l2 pudn
5433730bb

dd96d1263
-----
DUP: e2e, kubevirt, UDN: Add north south traffic test
6ab1f31de

f7ce763c7
-----
DUP: e2e, kubevirt, UDN: Check e/w tcp not broken after LM
217698ec5

a95f2a8b3
-----
DUP: e2e, kubevirt, UDN: Check migration with snat-per-pod
0c8610c0c

c9ff16e5e
-----
DUP: e2e, kubevirt, UDN: Check n/s egress not broken after LM
02735574c

d2922db70
-----
DUP: e2e, kubevirt, UDN: Check n/s tcp not broken after LM
db909a87f

0e69eb928
-----
DUP: e2e, kubevirt, UDN: Increase VM's memory
3115bae10

ad9391f96
-----
DUP: e2e, kubevirt, UDN: Use fedora and iperf
43c6087d8

a91e2b2e8
-----
DUP: EIP no reroute: allow multiple entries for pod to pod and pod to join
09261dc5c

33dcc93d3

27033e321
-----
DUP: Enrich CNI request pod UID error with the mismatched UIDs
d10321d99

6525e7e00

2d91da3d8
-----
DUP: factory/handler: avoid deadlock on shutdown.
7ae438c21

2458e3de4

b5163625a
-----
DUP: factory: Set default event queue size to 100.
116f7faa8

9e0f380f6

ea4d8a651
-----
DUP: Fix CM-EIP controller flake
ee2031167

8973f8e20
-----
DUP: Fix conflicting network prefix for (C)UDNs.
dad8daca7

6da0e6e96

6dc458cb7
-----
DUP: Fix CUDN unit test for status matching
b3fc2c91d

5f65e69a0
-----
DUP: Fix egress IP tests
253025a4c

81449ddde
-----
DUP: Fix EIP UT Flake: Don't delete the node on which pod lives
1b3313c6b

a31f477e0

e0c624543
-----
DUP: Fixes 1 minute delay for primary UDN controllers to start
2a8db0976

12cb69b57

3fbbc5b1f
-----
DUP: Fixes starting services/multinetpolicy on wrong controllers
65bc5c82e

73783c2b0
-----
DUP: Fix Kind IPV6 deplyoment with RUN_IN_CONTAINER
6b21a4046

ce6188499
-----
DUP: Fix some nftables checking in the unit tests
fc5d9373c

500dd720b
-----
DUP: Fix UDN and CUDN subnet validation
97e762bc4

eb3eeeba5

a2cbe9d27
-----
DUP: Get the network ID from the NAD for zone/node ctrls
67203d35e

c496a4423
-----
DUP: Handles unspecified protocol in network policy port
bc7e86e46

c0e366777

66c768f0b
-----
DUP: helm: Update documentation for ic and non-ic deployments
74dfde8cb

c79433ff4
-----
DUP: Improve annotation changes detection
bd18b0f04

13814c88a
-----
DUP: Improves multiplexed internal informer performance
faec7a095

0e48baff0
-----
DUP: kubevirt, e2e: Check ipv4 gateway mac after lm
a2599d7c1

0a79dabfd
-----
DUP: kubevirt: Function to reconcile IPv4 gateway mac
173215e6a

4ab5dfef5
-----
DUP: kv, e2e: Keep underlay with delete-namespace=false
7eea9195f

7e5ad64da
-----
DUP: kv, e2e, localnet: Activate tests
6a69eebc3

b08bd371c
-----
DUP: kv, e2e: Reduce live migration disruption treshold
04e3dba6b

d40191e1a
-----
DUP: kv, localnet: Swich LSP Enabled field on migration
836528282

afb4549fc
-----
DUP: kv, udn: Remove addresses when we disable LSP
cc55a58e4

62624ab7c
-----
DUP: Make dbus controller more efficient
9c2fbb186

bd5fff3a4

d59d69c82
-----
DUP: Make open default ports semantically correct
b842cd58e

ce13e95c0
-----
DUP: Merge remote-tracking branch 'origin/master' into merge-10-8-24
c6a0243e6

69781a1d7
-----
DUP: Merge remote-tracking branch 'ovn-org/master' into merge-11-15-24
fb4e12bcc

c2865df7c

74c08160d
-----
DUP: observability-lib/model: reduce dependencies by duplicating constants
18089e08e

9cce8ee50

60b5ebb41
-----
DUP: pin libreswan to 4.6-3.el9_0.3
5fda1fe22

776e76a0e

97a2e6b7e

7fa336012
-----
DUP: Reconcile pending pods when a NAD is added to an existing network
5cd56cfb9

8dd9eb349

73208692d
-----
DUP: Reimplement e2epod.DeletePodWithWait to correctly handle pods that get restarted.
a1f8c2bc1

1dc62cb6a
-----
DUP: Replace ovn-org with ovn-kubernetes to reflect repo move
18c95642f

b60587ad2

ccc391397
-----
DUP: Revert "hard code disable-udn-host-isolation to "true""
34411135a

d108b05b6
-----
DUP: Reverts 49e141a0a41793f94750a8bc998af05b7033dd91
877ed9b2d

adfa997fc
-----
DUP: RouteAdvertisements: switch label selectors to standard convention
2af5f56b8

d5e382072

23a9876e2
-----
DUP: RouteAdvertisements: update API to use universal NetworkSelector
65188addd

c177b355d

396ad2c45
-----
DUP: Slightly fix UDN local gateway masquerade rules (and unit tests)
be77a99ee

d59150a39
-----
DUP: test/e2e, go.mod: run go mod tidy
904b5b36a

47a12af81
-----
DUP: Update OVN to FDP25.A.1 24.09.2-41.
4af08abc3

65fe1aea9

9c4499b0b
-----
DUP: update requirements.txt to use minify-html
004855d40

f607624a7

817186b64
-----
DUP: Use partial parsing for network sepcific CIDRs
c36138096

f13b24494
-----
DUP: UserDefinedNetworks: Ignore pods and namespaces from different networks
bc37ea98b

715675c81
-----

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.18.0-202506260033.p0.gbe9ebb4.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.18.0-202506260033.p0.gbe9ebb4.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.18.0-202506260033.p0.gbe9ebb4.assembly.stream.el9.
All builds following this will include this PR.

igsilya added a commit to igsilya/openshift-os that referenced this pull request Jun 26, 2025
ovn-kubernetes container image moved to this version in:
  openshift/ovn-kubernetes#2593

While not strictly necessary, we should keep OVS versions between
os and ovn-k in sync in order to decrease the number of variables
in the system.

Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
igsilya added a commit to igsilya/microshift that referenced this pull request Jun 26, 2025
ovn-kubernetes container image moved to this version in:
  openshift/ovn-kubernetes#2593

MicroShift should be kept in sync.

Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
@igsilya
Copy link
Contributor

igsilya commented Jun 26, 2025

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.18.0-0.nightly-2025-06-26-034047

@tssurya
Copy link
Contributor

tssurya commented Jun 28, 2025

I think there is enough LGTM's here for me to add the risk-assessed label and get this in. I was hoping to not do this during shift week to avoid any potential issues but based on what @sdodson said above, we can get it in instead of waiting till next week to land the OVS bumps.

Risk-assessment for backport:

  1. I see a slight risk for backport because this is the first PR where we are bringing in the backport of the Kube Rebase from 4.19 to 4.18. Thanks to ART team for taking care of the golan version. However despite this risk CI is green and that's all the signal we can get. @jluhrsen if possible please keep an eye on the next two payloads that release after this lands to ensure they are green.
  2. Besides kube rebase I guess we are bumping swan to 5.2 here? @pperiyasamy whatever is the unpinned version in 4.18 which means the scale regression will be introduced in 4.18 as well? Any other IPSEC bugs?
  3. OVN bump as well but fdp lane was run and is green - again that's the best signal we can get
  4. Bringing in two new features: localnet API and BGP which are turned off in 4.18 actually and have 0 tests from QE side on 4.18 FYI @asood-rh : localnet is not behind a feature gate though BGP is - please do some regression tests for localnet feature or perhaps copy your automation tests to also run on 4.18 post this change - though its not officially supported on front facing docs - we just need to make sure we don't have regressions

Regardless the CI is fully green on all required jobs and that's the best we can do, acknowledging the above risks, adding the label since we need to get all the bug fixes landed into 4.18.

@tssurya The localnet API ( CUDN API with localnet support, UDN does not support Localnet in 4.19 ) is blocked on 4.18 so we do not need to run 4.19 tests against it. If we plan to support Localnet in 4.18 we should have an epic to track it.

4.18 just had a localnet on default network exposed through NAD.

The user gets a message for it as unsupported value in 4.18 for CUDN.

The ClusterUserDefinedNetwork "sec-localnet-net" is invalid: 
* spec.network.topology: Unsupported value: "Localnet": supported values: "Layer2", "Layer3"
* : Invalid value: "null": some validation rules were not checked because the object was invalid; correct the existing errors to complete validatio

As for BGP regression is underway and will update the results.

Oh that's weird.. I swear I saw the API for local net support commit here from @ormergi ....

Ohhhh hold on.. the CNO side of yaml change never happened :) so that's why it's off.. its good in some sense haha

openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/os that referenced this pull request Jul 3, 2025
ovn-kubernetes container image moved to this version in:
  openshift/ovn-kubernetes#2593

While not strictly necessary, we should keep OVS versions between
os and ovn-k in sync in order to decrease the number of variables
in the system.

Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.18.0-0.nightly-2025-10-23-005402

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.18.0-0.nightly-2025-12-24-222251

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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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.