kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Honor --iptables=false in bridge 

- When flag is false, not only do not program the chains,
  also do not perform any cleanup

Signed-off-by: Alessandro Boch <aboch@docker.com>
This commit is contained in:
Alessandro Boch 2016-01-13 23:23:43 -08:00
parent ad14618fc0
commit b8d2ac9b65
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libnetwork/drivers/bridge/bridge.go
View File

@ -135,7 +135,7 @@ func Init(dc driverapi.DriverCallback, config map[string]interface{}) error {
if err := iptables.FirewalldInit(); err != nil { if err := iptables.FirewalldInit(); err != nil {
logrus.Debugf("Fail to initialize firewalld: %v, using raw iptables instead", err) logrus.Debugf("Fail to initialize firewalld: %v, using raw iptables instead", err)
} }
removeIPChains()
d := newDriver() d := newDriver()
if err := d.configure(config); err != nil { if err := d.configure(config); err != nil {
return err return err
@ -378,6 +378,7 @@ func (d *driver) configure(option map[string]interface{}) error {
} }
if config.EnableIPTables { if config.EnableIPTables {
removeIPChains()
natChain, filterChain, isolationChain, err = setupIPChains(config) natChain, filterChain, isolationChain, err = setupIPChains(config)
if err != nil { if err != nil {
return err return err

8
libnetwork/drivers/bridge/bridge_test.go
View File

@ -817,12 +817,6 @@ func TestSetDefaultGw(t *testing.T) {
} }
} }
type fakeCallBack struct{}
func (cb fakeCallBack) RegisterDriver(name string, driver driverapi.Driver, capability driverapi.Capability) error {
return nil
}
func TestCleanupIptableRules(t *testing.T) { func TestCleanupIptableRules(t *testing.T) {
defer testutils.SetupTestOSContext(t)() defer testutils.SetupTestOSContext(t)()
bridgeChain := []iptables.ChainInfo{ bridgeChain := []iptables.ChainInfo{
@ -838,7 +832,7 @@ func TestCleanupIptableRules(t *testing.T) {
t.Fatalf("iptables chain %s of %s table should have been created", chainInfo.Name, chainInfo.Table) t.Fatalf("iptables chain %s of %s table should have been created", chainInfo.Name, chainInfo.Table)
} }
} }
Init(fakeCallBack{}, make(map[string]interface{})) removeIPChains()
for _, chainInfo := range bridgeChain { for _, chainInfo := range bridgeChain {
if iptables.ExistChain(chainInfo.Name, chainInfo.Table) { if iptables.ExistChain(chainInfo.Name, chainInfo.Table) {
t.Fatalf("iptables chain %s of %s table should have been deleted", chainInfo.Name, chainInfo.Table) t.Fatalf("iptables chain %s of %s table should have been deleted", chainInfo.Name, chainInfo.Table)