Merge pull request #206 from jonboulle/steveeJ-v0.2

v0.2.x: cherry-pick masquerading clean-up fixes
plugins/{ptp,bridge}: teardown first
2016-05-12 11:10:13 +02:00 · 2016-05-12 11:01:08 +02:00 · 2016-05-11 18:15:37 +02:00 · 2016-05-06 17:50:01 +02:00
3 changed files with 25 additions and 6 deletions
--- a/plugins/main/bridge/bridge.go
+++ b/plugins/main/bridge/bridge.go
@ -238,14 +238,29 @@ func cmdDel(args *skel.CmdArgs) error {
 		return err
 	}

-	err = ipam.ExecDel(n.IPAM.Type, args.StdinData)
+	if err := ipam.ExecDel(n.IPAM.Type, args.StdinData); err != nil {
+		return err
+	}
+
+	var ipn *net.IPNet
+	err = ns.WithNetNSPath(args.Netns, false, func(hostNS *os.File) error {
+		var err error
+		ipn, err = ip.DelLinkByNameAddr(args.IfName, netlink.FAMILY_V4)
+		return err
+	})
 	if err != nil {
 		return err
 	}

-	return ns.WithNetNSPath(args.Netns, false, func(hostNS *os.File) error {
-		return ip.DelLinkByName(args.IfName)
-	})
+	if n.IPMasq {
+		chain := utils.FormatChainName(n.Name, args.ContainerID)
+		comment := utils.FormatComment(n.Name, args.ContainerID)
+		if err = ip.TeardownIPMasq(ipn, chain, comment); err != nil {
+			return err
+		}
+	}
+
+	return nil
 }

 func main() {
--- a/plugins/main/ptp/ptp.go
+++ b/plugins/main/ptp/ptp.go
@ -195,6 +195,10 @@ func cmdDel(args *skel.CmdArgs) error {
 		return fmt.Errorf("failed to load netconf: %v", err)
 	}

+	if err := ipam.ExecDel(conf.IPAM.Type, args.StdinData); err != nil {
+		return err
+	}
+
 	var ipn *net.IPNet
 	err := ns.WithNetNSPath(args.Netns, false, func(hostNS *os.File) error {
 		var err error
@ -213,7 +217,7 @@ func cmdDel(args *skel.CmdArgs) error {
 		}
 	}

-	return ipam.ExecDel(conf.IPAM.Type, args.StdinData)
+	return nil
 }

 func main() {
--- a/scripts/release-with-rkt.sh
+++ b/scripts/release-with-rkt.sh
@ -26,7 +26,7 @@ sudo -E rkt run \
    ${FEDORA_IMAGE} \
    --exec /bin/bash \
    -- -xe -c "\
-    ${FEDORA_INSTALL}; cd /opt/src; umask 0022; CGO_ENABLED=0 ./build ${BUILDFLAGS}; ./test || true; \
+    ${FEDORA_INSTALL}; cd /opt/src; umask 0022; CGO_ENABLED=0 ./build ${BUILDFLAGS}; \
    for format in txz tbz2 tgz; do \
        FILENAME=cni-${TAG}.\$format; \
        FILEPATH=${RELEASE_DIR}/\$FILENAME; \
Author	SHA1	Message	Date
Jonathan Boulle	b634ff6bcd	Merge pull request #206 from jonboulle/steveeJ-v0.2 v0.2.x: cherry-pick masquerading clean-up fixes	2016-05-12 11:10:13 +02:00
Stefan Junker	8c51016e19	plugins/{ptp,bridge}: teardown first This will allow the IPAM allocations to be cleared in case the interfaces and iptables rules are non-existent.	2016-05-12 11:01:08 +02:00
Iago López Galeiras	320f810cfb	plugins/bridge: clean masquerading rules In the Add command we set up masquerading rules that didn't have a corresponding clean-up code in Del. Add the clean-up code.	2016-05-11 18:15:37 +02:00
Stefan Junker	19bb4a15bb	release script: don't run the tests For two reasons: 1. They're not functional within rkt 2. They rebuild the binaries dynamically	2016-05-06 17:50:01 +02:00