Fix to use latest cni for building (#182)

madhanrm · tamilmani1989 · commit d590c97e12b5 · 2018-07-05T15:22:24.000-07:00
diff --git a/cni/plugin.go b/cni/plugin.go
@@ -104,7 +104,7 @@ func (plugin *Plugin) DelegateAdd(pluginName string, nwCfg *NetworkConfig) (*cni
 
 	os.Setenv(Cmd, CmdAdd)
 
-	res, err := cniInvoke.DelegateAdd(pluginName, nwCfg.Serialize())
+	res, err := cniInvoke.DelegateAdd(pluginName, nwCfg.Serialize(), nil)
 	if err != nil {
 		return nil, fmt.Errorf("Failed to delegate: %v", err)
 	}
@@ -126,7 +126,7 @@ func (plugin *Plugin) DelegateDel(pluginName string, nwCfg *NetworkConfig) error
 
 	os.Setenv(Cmd, CmdDel)
 
-	err = cniInvoke.DelegateDel(pluginName, nwCfg.Serialize())
+	err = cniInvoke.DelegateDel(pluginName, nwCfg.Serialize(), nil)
 	if err != nil {
 		return fmt.Errorf("Failed to delegate: %v", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ func (plugin Plugin) DelegateAdd(pluginName string, nwCfg NetworkConfig) (*cni`
`104`	`104`
`105`	`105`	`os.Setenv(Cmd, CmdAdd)`
`106`	`106`
`107`		`- res, err := cniInvoke.DelegateAdd(pluginName, nwCfg.Serialize())`
	`107`	`+ res, err := cniInvoke.DelegateAdd(pluginName, nwCfg.Serialize(), nil)`
`108`	`108`	`if err != nil {`
`109`	`109`	`return nil, fmt.Errorf("Failed to delegate: %v", err)`
`110`	`110`	`}`
`@@ -126,7 +126,7 @@ func (plugin Plugin) DelegateDel(pluginName string, nwCfg NetworkConfig) error`
`126`	`126`
`127`	`127`	`os.Setenv(Cmd, CmdDel)`
`128`	`128`
`129`		`- err = cniInvoke.DelegateDel(pluginName, nwCfg.Serialize())`
	`129`	`+ err = cniInvoke.DelegateDel(pluginName, nwCfg.Serialize(), nil)`
`130`	`130`	`if err != nil {`
`131`	`131`	`return fmt.Errorf("Failed to delegate: %v", err)`
`132`	`132`	`}`