From d896b828167ee56b839b3ffc5d5fd57f4687c262 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Wed, 9 Sep 2015 14:02:51 +0200 Subject: [PATCH] ipvlan/macvlan: remove ipMasq related code 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. --- plugins/main/ipvlan/ipvlan.go | 8 -------- plugins/main/macvlan/macvlan.go | 8 -------- 2 files changed, 16 deletions(-) diff --git a/plugins/main/ipvlan/ipvlan.go b/plugins/main/ipvlan/ipvlan.go index fe4fc794..65e37b42 100644 --- a/plugins/main/ipvlan/ipvlan.go +++ b/plugins/main/ipvlan/ipvlan.go @@ -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() } diff --git a/plugins/main/macvlan/macvlan.go b/plugins/main/macvlan/macvlan.go index 5dd9b6c3..236693e0 100644 --- a/plugins/main/macvlan/macvlan.go +++ b/plugins/main/macvlan/macvlan.go @@ -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() }