Skip to content

Commit

Permalink
fix: fix bug that bcs-executor get runtime error; issue #88
Browse files Browse the repository at this point in the history
  • Loading branch information
abstractmj committed Jul 11, 2019
1 parent 8747d4c commit a38bbd7
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion bcs-mesos/bcs-container-executor/network/cni/cni.go
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,14 @@ func (plugin *CNIPlugin) addNetworkV2(runConf *libcni.RuntimeConf) (*current.Res
var r cnitypes.Result
if plugin.isCniList {
r, err = plugin.cniNet.AddNetworkList(plugin.netConfList, runConf)

if err != nil {
return nil, err
}
} else {
r, err = plugin.cniNet.AddNetwork(plugin.netConf, runConf)
if err != nil {
return nil, err
}
}

// Convert whatever the IPAM result was into the current Result type
Expand Down

0 comments on commit a38bbd7

Please sign in to comment.