From 455f5b76169515dcc36cf4d7c1d51ead3be02e1f Mon Sep 17 00:00:00 2001 From: Jakub Filak Date: Tue, 24 Sep 2019 21:45:48 +0200 Subject: vendor: updated ocicni for MAC address `go get github.com/cri-o/ocicni@deac903fd99b6c52d781c9f42b8db3af7dcfd00a` I had to fix compilation errors in libpod/networking_linux.go --- ocicni.Networks has changed from string to the structure NetAttachment with the member Name (the former string value) and the member Ifname (optional). I don't think we can make use of Ifname here, so I just map the array of structures to array of strings - e.g. dropping Ifname. --- The function GetPodNetworkStatus no longer returns Result but it returns the wrapper structure NetResult which contains the former Result plus NetAttachment (Network name and Interface name). Again, I don't think we can make use of that information here, so I just added `.Result` to fix the build. --- Issue: #1136 Signed-off-by: Jakub Filak --- vendor/github.com/containernetworking/cni/pkg/invoke/args.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vendor/github.com/containernetworking/cni/pkg/invoke/args.go') diff --git a/vendor/github.com/containernetworking/cni/pkg/invoke/args.go b/vendor/github.com/containernetworking/cni/pkg/invoke/args.go index 913528c1d..d31a44e87 100644 --- a/vendor/github.com/containernetworking/cni/pkg/invoke/args.go +++ b/vendor/github.com/containernetworking/cni/pkg/invoke/args.go @@ -32,7 +32,7 @@ type inherited struct{} var inheritArgsFromEnv inherited -func (_ *inherited) AsEnv() []string { +func (*inherited) AsEnv() []string { return nil } -- cgit v1.2.3-54-g00ecf