From 62dbe03193aca4b025438cdacf05e52f05368d6b Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Tue, 17 Oct 2017 16:13:48 +0000 Subject: [PATCH] Don't log nil errors in CNI DEL --- plugin/net/cni.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugin/net/cni.go b/plugin/net/cni.go index bfc4f45e..602f43ae 100644 --- a/plugin/net/cni.go +++ b/plugin/net/cni.go @@ -207,7 +207,9 @@ func (c *CNIPlugin) CmdDel(args *skel.CmdArgs) error { } else { err = ipam.ExecDel(conf.IPAM.Type, args.StdinData) } - logOnStderr(fmt.Errorf("unable to release IP address: %s", err)) + if err != nil { + logOnStderr(fmt.Errorf("unable to release IP address: %s", err)) + } return nil }