Merge pull request #568 from containernetworking/jell/vlan-1

[main/vlan] Fix error handling for delegate IPAM plugin
This commit is contained in:
Dan Williams
2021-01-20 10:31:32 -06:00
committed by GitHub

View File

@ -152,7 +152,7 @@ func cmdAdd(args *skel.CmdArgs) error {
// run the IPAM plugin and get back the config to apply // run the IPAM plugin and get back the config to apply
r, err := ipam.ExecAdd(n.IPAM.Type, args.StdinData) r, err := ipam.ExecAdd(n.IPAM.Type, args.StdinData)
if err != nil { if err != nil {
return err return fmt.Errorf("failed to execute IPAM delegate: %v", err)
} }
// Invoke ipam del if err to avoid ip leak // Invoke ipam del if err to avoid ip leak