rancher/plugins
1
0
Fork 1
mirror of https://github.com/rancher/plugins.git synced 2025-07-10 13:45:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #58 from steveeJ/remove-ipmasq-ifneedbe

Browse Source 
ipvlan/macvlan: remove ipMasq related code
This commit is contained in:
Stefan Junker 2015-09-10 22:08:57 +02:00
commit 5da5738456
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
Master string `json:"master"`
Mode string `json:"mode"`
IPMasq bool `json:"ipMasq"`
MTU int `json:"mtu"`
}
@ -138,13 +137,6 @@ func cmdAdd(args *skel.CmdArgs) error {
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()
}

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

@ -32,7 +32,6 @@ type NetConf struct {
plugin.NetConf
Master string `json:"master"`
Mode string `json:"mode"`
IPMasq bool `json:"ipMasq"`
MTU int `json:"mtu"`
}
@ -142,13 +141,6 @@ func cmdAdd(args *skel.CmdArgs) error {
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()
}