Added a different chain for iptables rules #1650
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
rbrtbnfgl
force-pushed
the
iptables-rule
branch
from
fe5d01f
to
e1b8075
Compare
rbrtbnfgl
force-pushed
the
iptables-rule
branch
3 times, most recently
from
273ccc6
to
7a9b0aa
Compare
manuelbuil
reviewed
Sep 27, 2022
network/iptables.go
Outdated
| @@ -135,7 +173,7 @@ func ipTablesRulesExist(ipt IPTables, rules []IPTablesRule) (bool, error) { | |||
| } | |||
|
|
|||
| // ipTablesCleanAndBuild create from a list of iptables rules a transaction (as string) for iptables-restore for ordering the rules that effectively running | |||
| func ipTablesCleanAndBuild(ipt IPTables, rules []IPTablesRule) (IPTablesRestoreRules, error) { | |||
| func ipTablesCleanAndBuild(ipt IPTables, rules []IPTablesRule, toChain bool) (IPTablesRestoreRules, error) { | |||
There was a problem hiding this comment.
Can you explain in the function comment what "toChain" mean?
There was a problem hiding this comment.
If the rule is used to send the traffic to the chain and it has to be added with -I and not -A.
Maybe I can modified to a more meaningful name.
network/iptables.go
Outdated
Comment on lines
46
to
53
| var MasqChain = []IPTablesRule{ | ||
| {"nat", "POSTROUTING", []string{"-m", "comment", "--comment", "flanneld masq", "-j", "FLANNEL-POSTRTG"}}, | ||
| } | ||
|
|
||
| var FwdChain = []IPTablesRule{ | ||
| {"filter", "FORWARD", []string{"-m", "comment", "--comment", "flanneld forward", "-j", "FLANNEL-FWD"}}, | ||
| } | ||
|
|
There was a problem hiding this comment.
You can have both definitions in one var ( ...) section
network/iptables_windows.go
Outdated
Comment on lines
34
to
40
| var MasqChain = []IPTablesRule{ | ||
| {"nat", "POSTROUTING", []string{"-m", "comment", "--comment", "flanneld masq", "-j", "FLANNEL-POSTRTG"}}, | ||
| } | ||
|
|
||
| var FwdChain = []IPTablesRule{ | ||
| {"filter", "FORWARD", []string{"-m", "comment", "--comment", "flanneld forward", "-j", "FLANNEL-FWD"}}, | ||
| } |
There was a problem hiding this comment.
You can define both variables in one var section
network/iptables_test.go
Outdated
| @@ -114,7 +114,7 @@ func TestDeleteRules(t *testing.T) { | |||
| baseRules := MasqRules(ip.IP4Net{}, lease()) | |||
| expectedRules := expectedTearDownIPTablesRestoreRules(baseRules) | |||
|
|
|||
| err := ipTablesBootstrap(ipt, iptr, baseRules) | |||
| err := ipTablesBootstrap(ipt, iptr, baseRules, false) | |||
There was a problem hiding this comment.
All use toChain=false, is it possible to create one that uses toChain=true?
rbrtbnfgl
force-pushed
the
iptables-rule
branch
2 times, most recently
from
744a437
to
e8482f3
Compare
manuelbuil
reviewed
Sep 28, 2022
network/iptables.go
Outdated
| ipt, err := iptables.NewWithProtocol(iptables.ProtocolIPv6) | ||
| if err != nil { | ||
| // if we can't find iptables, give up and return | ||
| log.Errorf("Failed to setup IPTables. iptables binary was not found: %v", err) |
There was a problem hiding this comment.
Could you add v6 in the logs? Just to differentiate with the ipv4 case. Imagine we get an error in a dual-stack env, we would not know where it is coming from
rbrtbnfgl
force-pushed
the
iptables-rule
branch
2 times, most recently
from
94d7556
to
40d4113
Compare
manuelbuil
approved these changes
Sep 28, 2022
Signed-off-by: rbrtbnfgl <roberto.bonafiglia@gmail.com>
Signed-off-by: rbrtbnfgl <roberto.bonafiglia@gmail.com>
Signed-off-by: rbrtbnfgl <roberto.bonafiglia@gmail.com>
rbrtbnfgl
force-pushed
the
iptables-rule
branch
from
40d4113
to
78c6ddf
Compare
Signed-off-by: rbrtbnfgl <roberto.bonafiglia@gmail.com>
thomasferrandiz
approved these changes
Oct 4, 2022
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.
Description
Added a different chain for Flannel iptables rules to order the rules before the one already present on the node.
It should solve #1619 #1542 #1033
Todos
Release Note