ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

bridge: don't use canonical CIDR address when setting up IP masquerade

Browse Source
This commit is contained in:
Nick Ethier 2019-05-25 20:55:47 -04:00
parent 7f9b1844b8
commit 37d2ee1d5d
No known key found for this signature in database
GPG Key ID: 07C1A3ECED90D24A
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/main/bridge/bridge.go
View File

@ -517,7 +517,7 @@ func cmdAdd(args *skel.CmdArgs) error {
chain := utils.FormatChainName(n.Name, args.ContainerID) chain := utils.FormatChainName(n.Name, args.ContainerID)
comment := utils.FormatComment(n.Name, args.ContainerID) comment := utils.FormatComment(n.Name, args.ContainerID)
for _, ipc := range result.IPs { 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 return err
} }
} }

2
plugins/main/bridge/bridge_test.go
View File

@ -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 { err := originalNS.Do(func(ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
tc := testCase{ tc := testCase{