ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

ipvlan/macvlan: remove ipMasq related code

Browse Source 
Luckily the docs haven't mentioned support for ipMasq for both plugins so far.
Even if anyone has attempted to enable the feature in their configuration files it didn't have the desired effect for the network.
This commit is contained in:
Stefan Junker 2015-09-09 14:02:51 +02:00
parent 75657b0aac
commit d896b82816
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/main/ipvlan/ipvlan.go
View File

@ -32,7 +32,6 @@ type NetConf struct {
plugin.NetConf plugin.NetConf
Master string `json:"master"` Master string `json:"master"`
Mode string `json:"mode"` Mode string `json:"mode"`
IPMasq bool `json:"ipMasq"`
MTU int `json:"mtu"` MTU int `json:"mtu"`
} }
@ -138,13 +137,6 @@ func cmdAdd(args *skel.CmdArgs) error {
return err return err
} }
if n.IPMasq {
chain := "CNI-" + n.Name
if err = ip.SetupIPMasq(ip.Network(&result.IP4.IP), chain); err != nil {
return err
}
}
return result.Print() return result.Print()
} }

8
plugins/main/macvlan/macvlan.go
View File

@ -32,7 +32,6 @@ type NetConf struct {
plugin.NetConf plugin.NetConf
Master string `json:"master"` Master string `json:"master"`
Mode string `json:"mode"` Mode string `json:"mode"`
IPMasq bool `json:"ipMasq"`
MTU int `json:"mtu"` MTU int `json:"mtu"`
} }
@ -142,13 +141,6 @@ func cmdAdd(args *skel.CmdArgs) error {
return err return err
} }
if n.IPMasq {
chain := "CNI-" + n.Name
if err = ip.SetupIPMasq(ip.Network(&result.IP4.IP), chain); err != nil {
return err
}
}
return result.Print() return result.Print()
} }