Allow install-no-conntrack-iptables-rules when masquerading is disabled
#18482
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pchaigno
added
release-note/minor
pchaigno
force-pushed
the
allow-noct-with-no-masquerading
branch
from
500672e
to
3d454f1
Compare
jibi
reviewed
Jan 17, 2022
There was a problem hiding this comment.
Looks good, thanks!
Could you also update the tuning guide please? At the moment it still mentions eBPF masquerading is required to enable install-no-conntrack-iptables-rules:
cilium/Documentation/operations/performance/tuning.rst
Lines 49 to 54 in 8bf4e22
MasqueradingEnabled returns true whenever IPv4 or IPv6 masquerading is enabled. Signed-off-by: Paul Chaignon <paul@cilium.io>
Until now the agent would fatal if install-no-conntrack-iptables-rules was passed when BPF masquerading is disabled, regardless of whether any masquerading is even enabled. What we want to avoid is for iptables-based masquerading to be used at the same time as install-no-conntrack-iptables-rules. Using install-no-conntrack-iptables-rules when no masquerading is enabled should be fine. Signed-off-by: Paul Chaignon <paul@cilium.io>
pchaigno
force-pushed
the
allow-noct-with-no-masquerading
branch
from
3d454f1
to
81ee108
Compare
qmonnet
approved these changes
Jan 17, 2022
jibi
approved these changes
Jan 17, 2022
|
Several tests failed with known flakes:
Reviews are in, except for the CLI team, but I'm not sure why that team was requested in the first place (I didn't modify any of our CLIs). Marking ready to merge. |
pchaigno
added
the
ready-to-merge
kkourt
added
backport-done/1.11
joestringer
moved this from Needs backport from master
to Backport done to v1.11
in 1.11.2
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The first commit introduces a helper function used by the second commit. The second commit allows
install-no-conntrack-iptables-rulesto be used if (1) BPF masquerading is used or if (2) all masquerading is disabled. Until now, it was only allowed for the first condition.