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.

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

iptables: remove logic to control non-existent net.ipv6.ip_early_demux #29310

Merged
merged 1 commit into from
Nov 28, 2023
Merged

iptables: remove logic to control non-existent net.ipv6.ip_early_demux #29310

merged 1 commit into from
Nov 28, 2023

Conversation

julianwiedmann
Copy link
Member

@julianwiedmann julianwiedmann commented Nov 21, 2023 •
edited
Loading 

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.

@julianwiedmann julianwiedmann added the sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages. label Nov 21, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Nov 21, 2023
@julianwiedmann julianwiedmann added the area/iptables Impacts how Cilium interacts with iptables. label Nov 21, 2023
@julianwiedmann
iptables: remove logic to control non-existent net.ipv6.ip_early_demux
becf41f 
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>
@julianwiedmann julianwiedmann added kind/bug This is a bug in the Cilium logic. release-note/bug This PR fixes an issue in a previous release of Cilium. labels Nov 24, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Nov 24, 2023
@julianwiedmann julianwiedmann added the needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch label Nov 24, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.14.5 Nov 24, 2023
@julianwiedmann
Copy link
Member Author

/test

@julianwiedmann julianwiedmann marked this pull request as ready for review November 24, 2023 14:15
@julianwiedmann julianwiedmann requested a review from a team as a code owner November 24, 2023 14:15
aspsk
aspsk approved these changes Nov 28, 2023
View reviewed changes
Copy link
Contributor

@aspsk aspsk left a comment

Choose a reason for hiding this comment

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

Nice

@julianwiedmann julianwiedmann added this pull request to the merge queue Nov 28, 2023
Merged via the queue into cilium:main with commit 0cdfe30 Nov 28, 2023
61 checks passed
@julianwiedmann julianwiedmann deleted the 1.15-iptables-demux branch November 28, 2023 10:38
@joamaki joamaki mentioned this pull request Nov 29, 2023
Merged
14 tasks
@joamaki joamaki added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. and removed needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Nov 29, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.14 in 1.14.5 Nov 29, 2023
@github-actions github-actions bot added backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. and removed backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. labels Dec 1, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.14 to Backport done to v1.14 in 1.14.5 Dec 1, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed this from Backport done to v1.14 in 1.14.5 Dec 1, 2023
@nebril nebril mentioned this pull request Dec 11, 2023
Merged
@julianwiedmann julianwiedmann added needs-backport/1.12 needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch labels Jan 3, 2024
@jibi jibi mentioned this pull request Jan 10, 2024
Merged
2 tasks
@jibi jibi mentioned this pull request Jan 10, 2024
Merged
4 tasks
@jibi jibi added backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. and removed needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch labels Jan 10, 2024
@github-actions github-actions bot added backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. and removed backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. backport-pending/1.12 labels Jan 15, 2024
This was referenced Jan 17, 2024
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@borkmann borkmann borkmann approved these changes

@aspsk aspsk aspsk approved these changes

@jrajahalme jrajahalme Awaiting requested review from jrajahalme

Assignees
No one assigned
Labels
area/iptables Impacts how Cilium interacts with iptables. backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. kind/bug This is a bug in the Cilium logic. release-note/bug This PR fixes an issue in a previous release of Cilium. sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages.
Projects
No open projects
cilium v1.12.18
Status: Released
cilium v1.13.11
Status: Released
cilium v1.14.5
Status: Released
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@julianwiedmann @borkmann @aspsk @jibi @joamaki