-
Notifications
You must be signed in to change notification settings - Fork 2.7k
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
iptables,option,node: Consistent condition for ipset usage #18788
Merged
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
kind/bug
This is a bug in the Cilium logic.
release-note/bug
This PR fixes an issue in a previous release of Cilium.
needs-backport/1.11
labels
Feb 11, 2022
ldelossa
approved these changes
Feb 16, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
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
Feb 16, 2022
nebril
added
the
dont-merge/needs-rebase
This PR needs to be rebased because it has merge conflicts.
label
Feb 17, 2022
This commit fixes a bug where we would create ipsets and fill them with IP addresses even though they would never be used by our iptables rules. To fix this, we introduce a new NodeIpsetNeeded helper function, such that there is a single place where we define whether node ipsets should be used. This helper function is then used both to create ipset iptables rules and add IP addresses to ipsets. Fixes: 49cb220 ("iptables: Don't masquerade traffic to cluster nodes") Signed-off-by: Paul Chaignon <paul@cilium.io>
pchaigno
removed
ready-to-merge
This PR has passed all tests and received consensus from code owners to merge.
dont-merge/needs-rebase
This PR needs to be rebased because it has merge conflicts.
labels
Feb 17, 2022
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
Feb 17, 2022
pchaigno
force-pushed
the
fix-condition-for-using-ipset
branch
from
February 17, 2022 10:11
cda325b
to
ef9e67e
Compare
/test |
nebril
removed
the
ready-to-merge
This PR has passed all tests and received consensus from code owners to merge.
label
Feb 17, 2022
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
Feb 17, 2022
maintainer-s-little-helper
bot
moved this from Needs backport from master
to Backport pending to v1.10
in 1.11.2
Feb 23, 2022
joestringer
added
the
backport-done/1.11
The backport for Cilium 1.11.x for this PR is done.
label
Mar 15, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
backport-done/1.11
The backport for Cilium 1.11.x for this PR is done.
kind/bug
This is a bug in the Cilium logic.
ready-to-merge
This PR has passed all tests and received consensus from code owners to merge.
release-note/bug
This PR fixes an issue in a previous release of Cilium.
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.
This pull request fixes a bug where we would create ipsets and fill them with IP addresses even though they would never be used by our iptables rules.
To fix this, we introduce a new
NodeIpsetNeeded
helper function, such that there is a single place where we define whether node ipsets should be used. This helper function is then used both to create ipset iptables rules and add IP addresses to ipsets.Fixes: #16603.
Related: #18787.