From 37d2ee1d5d2b0e7b4da18d7c3e49f9250bbe5ccb Mon Sep 17 00:00:00 2001 From: Nick Ethier Date: Sat, 25 May 2019 20:55:47 -0400 Subject: [PATCH] bridge: don't use canonical CIDR address when setting up IP masquerade --- plugins/main/bridge/bridge.go | 2 +- plugins/main/bridge/bridge_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/main/bridge/bridge.go b/plugins/main/bridge/bridge.go index 675ffdd2..fb78a5f8 100644 --- a/plugins/main/bridge/bridge.go +++ b/plugins/main/bridge/bridge.go @@ -517,7 +517,7 @@ func cmdAdd(args *skel.CmdArgs) error { chain := utils.FormatChainName(n.Name, args.ContainerID) comment := utils.FormatComment(n.Name, args.ContainerID) for _, ipc := range result.IPs { - if err = ip.SetupIPMasq(ip.Network(&ipc.Address), chain, comment); err != nil { + if err = ip.SetupIPMasq(&ipc.Address, chain, comment); err != nil { return err } } diff --git a/plugins/main/bridge/bridge_test.go b/plugins/main/bridge/bridge_test.go index e243664b..89a05b93 100644 --- a/plugins/main/bridge/bridge_test.go +++ b/plugins/main/bridge/bridge_test.go @@ -1609,7 +1609,7 @@ var _ = Describe("bridge Operations", func() { } }) - FIt("configures a bridge and ipMasq rules for 0.4.0 config", func() { + It("configures a bridge and ipMasq rules for 0.4.0 config", func() { err := originalNS.Do(func(ns.NetNS) error { defer GinkgoRecover() tc := testCase{