From fc46ce155d64201f9517f7b31136856cef0c7e9d Mon Sep 17 00:00:00 2001 From: Piotr Skamruk Date: Tue, 3 Jul 2018 15:18:22 +0200 Subject: [PATCH] Temporary switch to fork of netlink library While waiting for merge of https://github.com/vishvananda/netlink/pull/365 which is needed to read vlan info of VFs using PF - switching to fork containing required patch. --- glide.lock | 4 ++++ glide.yaml | 2 ++ pkg/nettools/nettools.go | 2 +- pkg/nettools/nettools_linux.go | 2 +- pkg/nettools/nettools_test.go | 2 +- pkg/nettools/nettools_unsupported.go | 2 +- pkg/nettools/tap_linux.go | 2 +- pkg/nettools/tap_unsupported.go | 2 +- pkg/tapmanager/tapfdsource.go | 2 +- 9 files changed, 13 insertions(+), 7 deletions(-) diff --git a/glide.lock b/glide.lock index 29cf2a80c..4967a7e5b 100644 --- a/glide.lock +++ b/glide.lock @@ -201,6 +201,10 @@ imports: - doc - name: github.com/spf13/pflag version: 4c012f6dcd9546820e378d0bdda4d8fc772cdfea +- name: github.com/jellonek/netlink + version: 9436cb892c0ae5c489016bd6b7928f7c77028d9d + subpackages: + - nl - name: github.com/vishvananda/netlink version: 028453c77ce572d3554b3873c654663283ac42a3 subpackages: diff --git a/glide.yaml b/glide.yaml index 853321e44..c83078395 100644 --- a/glide.yaml +++ b/glide.yaml @@ -23,6 +23,8 @@ import: version: v0.5.2 - package: github.com/vishvananda/netlink version: 028453c77ce572d3554b3873c654663283ac42a3 +- package: github.com/jellonek/netlink + version: 9436cb892c0ae5c489016bd6b7928f7c77028d9d - package: github.com/pmezard/go-difflib version: ~1.0.0 subpackages: diff --git a/pkg/nettools/nettools.go b/pkg/nettools/nettools.go index 759fc04df..0c1c965ae 100644 --- a/pkg/nettools/nettools.go +++ b/pkg/nettools/nettools.go @@ -50,7 +50,7 @@ import ( cnicurrent "github.com/containernetworking/cni/pkg/types/current" "github.com/davecgh/go-spew/spew" "github.com/golang/glog" - "github.com/vishvananda/netlink" + "github.com/jellonek/netlink" "github.com/Mirantis/virtlet/pkg/cni" "github.com/Mirantis/virtlet/pkg/network" diff --git a/pkg/nettools/nettools_linux.go b/pkg/nettools/nettools_linux.go index b828604b4..75501ffca 100644 --- a/pkg/nettools/nettools_linux.go +++ b/pkg/nettools/nettools_linux.go @@ -19,7 +19,7 @@ limitations under the License. package nettools import ( - "github.com/vishvananda/netlink" + "github.com/jellonek/netlink" "syscall" ) diff --git a/pkg/nettools/nettools_test.go b/pkg/nettools/nettools_test.go index 81ae0dd72..4e62124bf 100644 --- a/pkg/nettools/nettools_test.go +++ b/pkg/nettools/nettools_test.go @@ -28,7 +28,7 @@ import ( cnitypes "github.com/containernetworking/cni/pkg/types" cnicurrent "github.com/containernetworking/cni/pkg/types/current" "github.com/davecgh/go-spew/spew" - "github.com/vishvananda/netlink" + "github.com/jellonek/netlink" ) const ( diff --git a/pkg/nettools/nettools_unsupported.go b/pkg/nettools/nettools_unsupported.go index 49f0843e3..547500cab 100644 --- a/pkg/nettools/nettools_unsupported.go +++ b/pkg/nettools/nettools_unsupported.go @@ -19,7 +19,7 @@ limitations under the License. package nettools import ( - "github.com/vishvananda/netlink" + "github.com/jellonek/netlink" ) // Some missing constants that break syntax check diff --git a/pkg/nettools/tap_linux.go b/pkg/nettools/tap_linux.go index 266718147..be4351c48 100644 --- a/pkg/nettools/tap_linux.go +++ b/pkg/nettools/tap_linux.go @@ -25,7 +25,7 @@ import ( "syscall" "unsafe" - "github.com/vishvananda/netlink" + "github.com/jellonek/netlink" ) // OpenTAP opens a tap device and returns an os.File for it diff --git a/pkg/nettools/tap_unsupported.go b/pkg/nettools/tap_unsupported.go index 75542e4a5..6ff9d014a 100644 --- a/pkg/nettools/tap_unsupported.go +++ b/pkg/nettools/tap_unsupported.go @@ -22,7 +22,7 @@ import ( "errors" "os" - "github.com/vishvananda/netlink" + "github.com/jellonek/netlink" ) // OpenTAP opens a tap device and returns an os.File for it diff --git a/pkg/tapmanager/tapfdsource.go b/pkg/tapmanager/tapfdsource.go index 5d3c11e05..a91946cb7 100644 --- a/pkg/tapmanager/tapfdsource.go +++ b/pkg/tapmanager/tapfdsource.go @@ -29,7 +29,7 @@ import ( cnicurrent "github.com/containernetworking/cni/pkg/types/current" "github.com/davecgh/go-spew/spew" "github.com/golang/glog" - "github.com/vishvananda/netlink" + "github.com/jellonek/netlink" "github.com/Mirantis/virtlet/pkg/cni" "github.com/Mirantis/virtlet/pkg/dhcp"