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

Merge pull request #24 from squeed/flannel-return

Browse Source 
flannel: set the cniVersion on the delegated config
This commit is contained in:
Dan Williams
2017-06-28 08:45:02 -05:00
committed by GitHub
parent f01230d75f 8c5e754617
commit 5a7a8b3069
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/meta/flannel/flannel.go
View File

@ -224,6 +224,9 @@ func cmdAdd(args *skel.CmdArgs) error {
n.Delegate["isGateway"] = true
}
}
if n.CNIVersion != "" {
n.Delegate["cniVersion"] = n.CNIVersion
}
n.Delegate["ipam"] = map[string]interface{}{
"type": "host-local",

7
plugins/meta/flannel/flannel_test.go
View File

@ -19,6 +19,7 @@ import (
"os"
"github.com/containernetworking/cni/pkg/skel"
"github.com/containernetworking/cni/pkg/types/current"
"github.com/containernetworking/plugins/pkg/ns"
"github.com/containernetworking/plugins/pkg/testutils"
@ -102,7 +103,7 @@ FLANNEL_IPMASQ=true
defer GinkgoRecover()
By("calling ADD")
_, _, err := testutils.CmdAddWithResult(targetNs.Path(), IFNAME, []byte(input), func() error {
resI, _, err := testutils.CmdAddWithResult(targetNs.Path(), IFNAME, []byte(input), func() error {
return cmdAdd(args)
})
Expect(err).NotTo(HaveOccurred())
@ -132,6 +133,10 @@ FLANNEL_IPMASQ=true
`
Expect(netConfBytes).Should(MatchJSON(expected))
result, err := current.NewResultFromResult(resI)
Expect(err).NotTo(HaveOccurred())
Expect(result.IPs).To(HaveLen(1))
By("calling DEL")
err = testutils.CmdDelWithResult(targetNs.Path(), IFNAME, func() error {
return cmdDel(args)