Skip to content
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.

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

v1.12 Backports 2024-01-10 #30181

Merged
merged 2 commits into from
Jan 15, 2024
Merged

Conversation

jibi
Copy link
Member

@jibi jibi commented Jan 10, 2024

julianwiedmann and others added 2 commits January 10, 2024 14:34
[ upstream commit 0cdfe30 ]

Early demux for both IP protocols is controlled by the IPv4 sysctl. Trying
to control net.ipv6.ip_early_demux would just result in awkward error
scenarios.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit 4ad5718 ]

Signed-off-by: renovate[bot] <bot@renovateapp.com>
@jibi jibi added kind/backports This PR provides functionality previously merged into master. backport/1.12 This PR represents a backport for Cilium 1.12.x of a PR that was merged to main. labels Jan 10, 2024
@jibi
Copy link
Member Author

jibi commented Jan 12, 2024

/test-backport-1.12

@jibi jibi marked this pull request as ready for review January 12, 2024 07:44
@jibi jibi requested a review from a team as a code owner January 12, 2024 07:44
@dylandreimerink dylandreimerink merged commit 396ae77 into v1.12 Jan 15, 2024
109 of 112 checks passed
@dylandreimerink dylandreimerink deleted the pr/v1.12-backport-2024-01-10 branch January 15, 2024 08:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.12 This PR represents a backport for Cilium 1.12.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.

None yet

3 participants