Skip to content

[v1.18] loadbalancer: Fix flake in hybrid-dsr.txtar#44756

Merged
julianwiedmann merged 1 commit intov1.18from
pr/jwi/v1.18/dsr-test
Mar 13, 2026
Merged

[v1.18] loadbalancer: Fix flake in hybrid-dsr.txtar#44756
julianwiedmann merged 1 commit intov1.18from
pr/jwi/v1.18/dsr-test

Conversation

@julianwiedmann
Copy link
Copy Markdown
Member

Grab a small test fix-up from #42440 to de-flake the changes introduced by #43056.

Fixes: #44721

@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.18 This PR represents a backport for Cilium 1.18.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. labels Mar 12, 2026
@julianwiedmann
Copy link
Copy Markdown
Member Author

/test

@julianwiedmann julianwiedmann marked this pull request as ready for review March 12, 2026 15:12
@julianwiedmann julianwiedmann requested a review from a team as a code owner March 12, 2026 15:12
@julianwiedmann julianwiedmann requested a review from joamaki March 12, 2026 15:12
[ upstream commit b44725f ]

The TCP and UDP services were added at the same time which
sometimes caused the IDs to be allocated in an unexpected
order. Fix this by adding the TCP service first and waiting
for it to get reconciled and only then add the UDP service.

Signed-off-by: Jussi Maki <jussi@isovalent.com>
Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
@julianwiedmann julianwiedmann force-pushed the pr/jwi/v1.18/dsr-test branch from 70fda50 to 196a711 Compare March 13, 2026 04:06
@julianwiedmann
Copy link
Copy Markdown
Member Author

/test

@julianwiedmann julianwiedmann added this pull request to the merge queue Mar 13, 2026
Merged via the queue into v1.18 with commit 5f6fdb8 Mar 13, 2026
308 of 309 checks passed
@julianwiedmann julianwiedmann deleted the pr/jwi/v1.18/dsr-test branch March 13, 2026 07:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport/1.18 This PR represents a backport for Cilium 1.18.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[v1.18] CI: Integration Tests: pkg/loadbalancer/tests - TestScript/hybrid-dsr (ubuntu 24.04 arm)

4 participants