From 5607b23b0f7fd48645372adeab96515882ad0d97 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 7 Mar 2020 13:14:56 +0100 Subject: [PATCH] vendor.conf: move some imports to match position with containerd/cri Signed-off-by: Sebastiaan van Stijn --- vendor.conf | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/vendor.conf b/vendor.conf index c8a046e9e..01ffe1016 100644 --- a/vendor.conf +++ b/vendor.conf @@ -52,11 +52,11 @@ google.golang.org/genproto e50cd9704f63023d62cd06a1994b google.golang.org/grpc f495f5b15ae7ccda3b38c53a1bfcde4c1a58a2bc # v1.27.1 gotest.tools/v3 bb0d8a963040ea5048dcef1a14d8f8b58a33d4b3 # v3.0.2 +# cgroups dependencies +github.com/cilium/ebpf 60c3aa43f488292fe2ee50fb8b833b383ca8ebbb + # cri dependencies github.com/containerd/cri c0294ebfe0b4342db85c0faf7727ceb8d8c3afce # master -github.com/containerd/go-cni 0d360c50b10b350b6bb23863fd4dfb1c232b01c9 -github.com/containernetworking/cni 4cfb7b568922a3c79a23e438dc52fe537fc9687e # v0.7.1 -github.com/containernetworking/plugins 9f96827c7cabb03f21d86326000c00f61e181f6a # v0.7.6 github.com/davecgh/go-spew 8991bc29aa16c548c550c7ff78260e27b9ab7c73 # v1.1.1 github.com/docker/distribution 0d3efadf0154c2b8a4e7b6621fff9809655cc580 github.com/docker/docker d1d5f6476656c6aad457e2a91d3436e66b6f2251 @@ -85,12 +85,14 @@ k8s.io/kubernetes d224476cd0730baca2b6e357d144 k8s.io/utils e782cd3c129fc98ee807f3c889c0f26eb7c9daf5 sigs.k8s.io/yaml fd68e9863619f6ec2fdd8625fe1f02e7c877e480 # v1.1.0 +# cni dependencies +github.com/containerd/go-cni 0d360c50b10b350b6bb23863fd4dfb1c232b01c9 +github.com/containernetworking/cni 4cfb7b568922a3c79a23e438dc52fe537fc9687e # v0.7.1 +github.com/containernetworking/plugins 9f96827c7cabb03f21d86326000c00f61e181f6a # v0.7.6 + # zfs dependencies github.com/containerd/zfs 9abf673ca6ff9ab8d9bd776a4ceff8f6dc699c3d github.com/mistifyio/go-zfs f784269be439d704d3dfa1906f45dd848fed2beb # aufs dependencies github.com/containerd/aufs 371312c1e31c210a21e49bf3dfd3f31729ed9f2f - -# cgroups dependencies -github.com/cilium/ebpf 60c3aa43f488292fe2ee50fb8b833b383ca8ebbb