From 29801c45a73db49dae76b279e53ee8c1d9db083a Mon Sep 17 00:00:00 2001
From: Casey Callendrello <cdc@redhat.com>
Date: Tue, 30 Apr 2019 15:46:12 +0200
Subject: [PATCH] vendor: bump cni to v0.7.0

---
 Godeps/Godeps.json                            | 28 +++++++++----------
 .../cni/pkg/invoke/raw_exec.go                |  4 ++-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index e0386f02..6461ef5c 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -81,38 +81,38 @@
 		},
 		{
 			"ImportPath": "github.com/containernetworking/cni/libcni",
-			"Comment": "v0.7.0-rc2",
-			"Rev": "fbb95fff8a5239a4295c991efa8a397d43118f7e"
+			"Comment": "v0.7.0",
+			"Rev": "7d76556571b6cf1ab90d7026a73092ac8d5e0c23"
 		},
 		{
 			"ImportPath": "github.com/containernetworking/cni/pkg/invoke",
-			"Comment": "v0.7.0-rc2",
-			"Rev": "fbb95fff8a5239a4295c991efa8a397d43118f7e"
+			"Comment": "v0.7.0",
+			"Rev": "7d76556571b6cf1ab90d7026a73092ac8d5e0c23"
 		},
 		{
 			"ImportPath": "github.com/containernetworking/cni/pkg/skel",
-			"Comment": "v0.7.0-rc2",
-			"Rev": "fbb95fff8a5239a4295c991efa8a397d43118f7e"
+			"Comment": "v0.7.0",
+			"Rev": "7d76556571b6cf1ab90d7026a73092ac8d5e0c23"
 		},
 		{
 			"ImportPath": "github.com/containernetworking/cni/pkg/types",
-			"Comment": "v0.7.0-rc2",
-			"Rev": "fbb95fff8a5239a4295c991efa8a397d43118f7e"
+			"Comment": "v0.7.0",
+			"Rev": "7d76556571b6cf1ab90d7026a73092ac8d5e0c23"
 		},
 		{
 			"ImportPath": "github.com/containernetworking/cni/pkg/types/020",
-			"Comment": "v0.7.0-rc2",
-			"Rev": "fbb95fff8a5239a4295c991efa8a397d43118f7e"
+			"Comment": "v0.7.0",
+			"Rev": "7d76556571b6cf1ab90d7026a73092ac8d5e0c23"
 		},
 		{
 			"ImportPath": "github.com/containernetworking/cni/pkg/types/current",
-			"Comment": "v0.7.0-rc2",
-			"Rev": "fbb95fff8a5239a4295c991efa8a397d43118f7e"
+			"Comment": "v0.7.0",
+			"Rev": "7d76556571b6cf1ab90d7026a73092ac8d5e0c23"
 		},
 		{
 			"ImportPath": "github.com/containernetworking/cni/pkg/version",
-			"Comment": "v0.7.0-rc2",
-			"Rev": "fbb95fff8a5239a4295c991efa8a397d43118f7e"
+			"Comment": "v0.7.0",
+			"Rev": "7d76556571b6cf1ab90d7026a73092ac8d5e0c23"
 		},
 		{
 			"ImportPath": "github.com/coreos/go-iptables/iptables",
diff --git a/vendor/github.com/containernetworking/cni/pkg/invoke/raw_exec.go b/vendor/github.com/containernetworking/cni/pkg/invoke/raw_exec.go
index e5b86634..ad8498ba 100644
--- a/vendor/github.com/containernetworking/cni/pkg/invoke/raw_exec.go
+++ b/vendor/github.com/containernetworking/cni/pkg/invoke/raw_exec.go
@@ -46,7 +46,9 @@ func (e *RawExec) ExecPlugin(ctx context.Context, pluginPath string, stdinData [
 func pluginErr(err error, output []byte) error {
 	if _, ok := err.(*exec.ExitError); ok {
 		emsg := types.Error{}
-		if perr := json.Unmarshal(output, &emsg); perr != nil {
+		if len(output) == 0 {
+			emsg.Msg = "netplugin failed with no error message"
+		} else if perr := json.Unmarshal(output, &emsg); perr != nil {
 			emsg.Msg = fmt.Sprintf("netplugin failed but error parsing its diagnostic message %q: %v", string(output), perr)
 		}
 		return &emsg