Skip to content

Fix for unparseable error returned by Azure CNI #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 8, 2018
Merged

Fix for unparseable error returned by Azure CNI #212

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46887df
Write result to stdout only in successful case
tamilmani1989 Jul 30, 2018
14efabc
fixed log
tamilmani1989 Jul 31, 2018
93cd325
addressed review comments
tamilmani1989 Aug 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions cni/network/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,6 @@ func (plugin *netPlugin) Add(args *cniSkel.CmdArgs) error {
args.ContainerID, args.Netns, args.IfName, args.Args, args.Path)

defer func() {
if result == nil {
result = &cniTypesCurr.Result{}
}

// Add Interfaces to result.
if result == nil {
result = &cniTypesCurr.Result{}
Expand All @@ -169,13 +165,17 @@ func (plugin *netPlugin) Add(args *cniSkel.CmdArgs) error {
addSnatInterface(nwCfg, result)

// Convert result to the requested CNI version.
res, err := result.GetAsVersion(nwCfg.CNIVersion)
if err != nil {
err = plugin.Error(err)
res, vererr := result.GetAsVersion(nwCfg.CNIVersion)
if vererr != nil {
log.Printf("GetAsVersion failed with error %v", vererr)
plugin.Error(vererr)
}

if err == nil && res != nil {
// Output the result to stdout.
res.Print()
}

// Output the result to stdout.
res.Print()
log.Printf("[cni-net] ADD command completed with result:%+v err:%v.", result, err)
}()

Expand Down