Combine Outgoing and ICC=true iptables rules #48641
Merged
Conversation
This file contains hidden or 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
f9c3c8f to
6755020
Compare
7f31c24 to
6e96e9e
Compare
11 tasks
5b463f8 to
c4b3d08
Compare
- Move variable declarations closer to where they're used. - Put comments in the blocks they apply to. Signed-off-by: Rob Murray <rob.murray@docker.com>
setupIPTablesInternal is/was called from setupIPTables to set up some rules for a network ... "internal" behaviour of the outer function. Then commit 7b64b1c added support for "--internal" bridge networks, calling setupInternalNetworkRules from setupIPTables instead of setupIPTablesInternal. So, setupIPTablesInternal is the function that deals with everything except "--internal" networks ... rename it. Signed-off-by: Rob Murray <rob.murray@docker.com>
Rather than: ACCEPT -i <bridge> -o <bridge> // icc=true ACCEPT -i <bridge> ! -o <bridge> // outgoing Do: ACCEPT -i <bridge> // icc=true and outgoing For ICC=false, continue to do: DROP -i <bridge> -o <bridge> ACCEPT -i <bridge> ! -o <bridge> Signed-off-by: Rob Murray <rob.murray@docker.com>
c4b3d08 to
df3c78d
Compare
akerouanton
approved these changes
Dec 17, 2024
vvoland
approved these changes
Dec 17, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
- What I did
Only add a single rule to the iptables filter-FORWARD chain for each bridge network in the common case (down from four rules per bridge in 27.x, down from two before this PR).
- How I did it
For a bridge network with default configuration (gateway mode nat, and inter-container communication enabled), we created two rules in the filter-FORWARD chain:
This PR combines those:
For
ICC=false, continue to do:- How to verify it
No functional change - so, existing tests. The updated markdown generated by an integration test shows the effect.
- Description for the changelog