No more path rewriting
Path rewriting causes too many problems when vendoring vendored code. When CNI code is vendored into rkt, godep has problems code already vendored by CNI.
This commit is contained in:
parent
31c0dbf110
commit
6caffd48b3
@ -18,7 +18,7 @@ import (
|
||||
"fmt"
|
||||
"net"
|
||||
|
||||
"github.com/appc/cni/Godeps/_workspace/src/github.com/coreos/go-iptables/iptables"
|
||||
"github.com/coreos/go-iptables/iptables"
|
||||
)
|
||||
|
||||
// SetupIPMasq installs iptables rules to masquerade traffic
|
||||
|
@ -20,7 +20,7 @@ import (
|
||||
"net"
|
||||
"os"
|
||||
|
||||
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink"
|
||||
"github.com/vishvananda/netlink"
|
||||
)
|
||||
|
||||
func makeVethPair(name, peer string, mtu int) (netlink.Link, error) {
|
||||
|
@ -17,7 +17,7 @@ package ip
|
||||
import (
|
||||
"net"
|
||||
|
||||
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink"
|
||||
"github.com/vishvananda/netlink"
|
||||
)
|
||||
|
||||
// AddDefaultRoute sets the default route on the given gateway.
|
||||
|
@ -23,8 +23,8 @@ import (
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink"
|
||||
"github.com/appc/cni/pkg/ip"
|
||||
"github.com/vishvananda/netlink"
|
||||
)
|
||||
|
||||
// Find returns the full path of the plugin by searching in CNI_PATH
|
||||
|
Loading…
x
Reference in New Issue
Block a user