Skip to content

Commit

Permalink
Temporary switch to fork of netlink library
Browse files Browse the repository at this point in the history
While waiting for merge of vishvananda/netlink#365
which is needed to read vlan info of VFs using PF - switching to fork
containing required patch.
  • Loading branch information
jellonek committed Jul 3, 2018
1 parent ecaa313 commit fc46ce1
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 7 deletions.
4 changes: 4 additions & 0 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion pkg/nettools/nettools.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/nettools/nettools_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ limitations under the License.
package nettools

import (
"github.com/vishvananda/netlink"
"github.com/jellonek/netlink"
"syscall"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/nettools/nettools_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion pkg/nettools/nettools_unsupported.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/nettools/tap_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/nettools/tap_unsupported.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/tapmanager/tapfdsource.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit fc46ce1

Please sign in to comment.