From b5172f46c162b573a14b33dc0fd26b9937439953 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Wed, 15 Mar 2017 17:48:12 +0000
Subject: [PATCH] Honour the input version number

---
 plugin/ipam/cni.go | 6 +++++-
 plugin/net/cni.go  | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugin/ipam/cni.go b/plugin/ipam/cni.go
index ac371f6d..628cb1db 100644
--- a/plugin/ipam/cni.go
+++ b/plugin/ipam/cni.go
@@ -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) {
diff --git a/plugin/net/cni.go b/plugin/net/cni.go
index 452b1b83..fcf208fc 100644
--- a/plugin/net/cni.go
+++ b/plugin/net/cni.go
@@ -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 {