Honour the input version number

This commit is contained in:
Bryan Boreham authored and Marc Carré committed 2017-03-16 18:23:20 +00:00
1 parent 5a6cb8e708
commit b5172f46c1
2 files changed
+6 -2

No files matched your search

+5 -1
View File
@@ -11,11 +11,15 @@ import (
)
func (i *Ipam) CmdAdd(args *skel.CmdArgs) error {
var conf types.NetConf
if err := json.Unmarshal(args.StdinData, &conf); err != nil {
return fmt.Errorf("failed to load netconf: %v", err)
}
result, err := i.Allocate(args)
if err != nil {
return err
}
return result.Print()
return types.PrintResult(result, conf.CNIVersion)
}
func (i *Ipam) Allocate(args *skel.CmdArgs) (types.Result, error) {
+1 -1
View File
@@ -131,7 +131,7 @@ func (c *CNIPlugin) CmdAdd(args *skel.CmdArgs) error {
}
result.DNS = conf.DNS
return result.Print()
return types.PrintResult(result, conf.CNIVersion)
}
func setupRoutes(link netlink.Link, name string, ipnet net.IPNet, gw net.IP, routes []*types.Route) error {