From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 9 Sep 2015 12:02:51 +0000 (+0200)
Subject: ipvlan/macvlan: remove ipMasq related code
X-Git-Url: https://git.halfball.org/?a=commitdiff_plain;h=d896b828167ee56b839b3ffc5d5fd57f4687c262;p=cni.git

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.
---

diff --git a/plugins/main/ipvlan/ipvlan.go b/plugins/main/ipvlan/ipvlan.go
index fe4fc79..65e37b4 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 5dd9b6c..236693e 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()
 }