diff options
| author | Jakub Filak <jakub.filak@sap.com> | 2019-09-24 21:45:48 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-11-06 16:22:18 +0100 |
| commit | 455f5b76169515dcc36cf4d7c1d51ead3be02e1f (patch) | |
| tree | 212ae930aa545132929a3ae2ded94009110a6485 /vendor/modules.txt | |
| parent | 16cb2b38a8a645039bc4e2e9443cde777d90537f (diff) | |
| download | podman-455f5b76169515dcc36cf4d7c1d51ead3be02e1f.tar.gz podman-455f5b76169515dcc36cf4d7c1d51ead3be02e1f.tar.bz2 podman-455f5b76169515dcc36cf4d7c1d51ead3be02e1f.zip | |
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 <jakub.filak@sap.com>
Diffstat (limited to 'vendor/modules.txt')
| -rw-r--r-- | vendor/modules.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vendor/modules.txt b/vendor/modules.txt index 53239b7cd..79cf820b8 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -42,13 +42,14 @@ github.com/containerd/containerd/errdefs github.com/containerd/continuity/fs github.com/containerd/continuity/sysx github.com/containerd/continuity/syscallx -# github.com/containernetworking/cni v0.7.1 +# github.com/containernetworking/cni v0.7.2-0.20190904153231-83439463f784 github.com/containernetworking/cni/pkg/types github.com/containernetworking/cni/pkg/types/current github.com/containernetworking/cni/pkg/version github.com/containernetworking/cni/libcni github.com/containernetworking/cni/pkg/invoke github.com/containernetworking/cni/pkg/types/020 +github.com/containernetworking/cni/pkg/utils # github.com/containernetworking/plugins v0.8.2 github.com/containernetworking/plugins/pkg/ns github.com/containernetworking/plugins/pkg/ip @@ -169,7 +170,7 @@ github.com/coreos/go-systemd/sdjournal github.com/coreos/go-systemd/journal # github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f github.com/coreos/pkg/dlopen -# github.com/cri-o/ocicni v0.1.1-0.20190702175919-7762645d18ca +# github.com/cri-o/ocicni v0.1.1-0.20190920040751-deac903fd99b github.com/cri-o/ocicni/pkg/ocicni # github.com/cyphar/filepath-securejoin v0.2.2 github.com/cyphar/filepath-securejoin |