Skip to content

v1.14 Backports 2024-10-28 #35588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Oct 28, 2024
Merged

v1.14 Backports 2024-10-28 #35588

merged 3 commits into from
Oct 28, 2024

Conversation

rastislavs
Copy link
Contributor

@rastislavs rastislavs commented Oct 28, 2024 •
edited by julianwiedmann
Loading

Once this PR is merged, a GitHub action will update the labels of these PRs:

 33998 35286 35574

marseel and others added 3 commits October 28, 2024 11:58
@marseel @rastislavs
dnsproxy: fix error when sessionUDPFactory fails
57be1cb 
[ upstream commit 5e59656 ]

Before, we were always printing nil from previous err rather than
current ferr.

Fixes: #28163

Signed-off-by: Marcel Zieba <marcel.zieba@isovalent.com>
Signed-off-by: Rastislav Szabo <rastislav.szabo@isovalent.com>
@julianwiedmann @rastislavs
ci: conformance-kind: re-enable flaky Aggregator test
65cbb8d 
[ upstream commit c321f90 ]

[ backporter's notes: manually resolved conflict in skipped features ]

Looking at #24622 this should now
be fixed.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
@julianwiedmann @rastislavs
docs: tuning: XDP LB also supports tunnel routing
cf34467 
[ upstream commit a4da426 ]

Tunnel routing support for the XDP LB was added back in v1.14, update
the docs. This was missed in #27091.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
Signed-off-by: Rastislav Szabo <rastislav.szabo@isovalent.com>
@rastislavs rastislavs added kind/backports This PR provides functionality previously merged into master. backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. labels Oct 28, 2024
@rastislavs
Copy link
Contributor Author

/test-backport-1.14

@rastislavs rastislavs marked this pull request as ready for review October 28, 2024 11:31
@rastislavs rastislavs requested review from a team as code owners October 28, 2024 11:31
@rastislavs rastislavs requested a review from brlbil October 28, 2024 11:31
julianwiedmann
julianwiedmann reviewed Oct 28, 2024
View reviewed changes
Copy link
Member

@julianwiedmann julianwiedmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ran conformance-test 3x, all good

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Oct 28, 2024
@julianwiedmann julianwiedmann merged commit 3b3747d into v1.14 Oct 28, 2024
249 checks passed
@julianwiedmann julianwiedmann deleted the pr/v1.14-backport-2024-10-28-11-58 branch October 28, 2024 12:38
@cilium-release-bot cilium-release-bot bot mentioned this pull request Nov 13, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marseel marseel marseel approved these changes

@brlbil brlbil brlbil approved these changes

@julianwiedmann julianwiedmann julianwiedmann approved these changes

Assignees
No one assigned
Labels
backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@rastislavs @marseel @brlbil @julianwiedmann