ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

No more path rewriting

Browse Source 
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:
Eugene Yakubovich 2015-06-12 12:15:11 -07:00
parent 02981925c9
commit 16680be42d
28 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Godeps/_workspace/src/github.com/d2g/dhcp4client/client.go generated vendored
View File

@ -6,7 +6,7 @@ import (
"net" "net"
"time" "time"
"github.com/appc/cni/Godeps/_workspace/src/github.com/d2g/dhcp4" "github.com/d2g/dhcp4"
) )
const ( const (

2
Godeps/_workspace/src/github.com/d2g/dhcp4client/pktsock_linux.go generated vendored
View File

@ -6,7 +6,7 @@ import (
"net" "net"
"time" "time"
"github.com/appc/cni/Godeps/_workspace/src/golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
const ( const (

2
Godeps/_workspace/src/github.com/vishvananda/netlink/addr_linux.go generated vendored
View File

@ -6,7 +6,7 @@ import (
"strings" "strings"
"syscall" "syscall"
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/nl" "github.com/vishvananda/netlink/nl"
) )
// AddrAdd will add an IP address to a link device. // AddrAdd will add an IP address to a link device.

2
Godeps/_workspace/src/github.com/vishvananda/netlink/link_linux.go generated vendored
View File

@ -7,7 +7,7 @@ import (
"net" "net"
"syscall" "syscall"
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/nl" "github.com/vishvananda/netlink/nl"
) )
var native = nl.NativeEndian() var native = nl.NativeEndian()

2
Godeps/_workspace/src/github.com/vishvananda/netlink/neigh_linux.go generated vendored
View File

@ -5,7 +5,7 @@ import (
"syscall" "syscall"
"unsafe" "unsafe"
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/nl" "github.com/vishvananda/netlink/nl"
) )
const ( const (

2
Godeps/_workspace/src/github.com/vishvananda/netlink/netlink.go generated vendored
View File

@ -11,7 +11,7 @@ package netlink
import ( import (
"net" "net"
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/nl" "github.com/vishvananda/netlink/nl"
) )
const ( const (

2
Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo_linux.go generated vendored
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"syscall" "syscall"
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/nl" "github.com/vishvananda/netlink/nl"
) )
func LinkGetProtinfo(link Link) (Protinfo, error) { func LinkGetProtinfo(link Link) (Protinfo, error) {

2
Godeps/_workspace/src/github.com/vishvananda/netlink/route_linux.go generated vendored
View File

@ -5,7 +5,7 @@ import (
"net" "net"
"syscall" "syscall"
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/nl" "github.com/vishvananda/netlink/nl"
) )
// RtAttr is shared so it is in netlink_linux.go // RtAttr is shared so it is in netlink_linux.go

2
Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy_linux.go generated vendored
View File

@ -3,7 +3,7 @@ package netlink
import ( import (
"syscall" "syscall"
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/nl" "github.com/vishvananda/netlink/nl"
) )
func selFromPolicy(sel *nl.XfrmSelector, policy *XfrmPolicy) { func selFromPolicy(sel *nl.XfrmSelector, policy *XfrmPolicy) {

2
Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state_linux.go generated vendored
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"syscall" "syscall"
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/nl" "github.com/vishvananda/netlink/nl"
) )
func writeStateAlgo(a *XfrmStateAlgo) []byte { func writeStateAlgo(a *XfrmStateAlgo) []byte {

2
Godeps/_workspace/src/golang.org/x/sys/unix/creds_test.go generated vendored
View File

@ -13,7 +13,7 @@ import (
"syscall" "syscall"
"testing" "testing"
"github.com/appc/cni/Godeps/_workspace/src/golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
// TestSCMCredentials tests the sending and receiving of credentials // TestSCMCredentials tests the sending and receiving of credentials

2
Godeps/_workspace/src/golang.org/x/sys/unix/mmap_unix_test.go generated vendored
View File

@ -9,7 +9,7 @@ package unix_test
import ( import (
"testing" "testing"
"github.com/appc/cni/Godeps/_workspace/src/golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
func TestMmap(t *testing.T) { func TestMmap(t *testing.T) {

2
Godeps/_workspace/src/golang.org/x/sys/unix/syscall_bsd_test.go generated vendored
View File

@ -9,7 +9,7 @@ package unix_test
import ( import (
"testing" "testing"
"github.com/appc/cni/Godeps/_workspace/src/golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
const MNT_WAIT = 1 const MNT_WAIT = 1

2
Godeps/_workspace/src/golang.org/x/sys/unix/syscall_test.go generated vendored
View File

@ -9,7 +9,7 @@ package unix_test
import ( import (
"testing" "testing"
"github.com/appc/cni/Godeps/_workspace/src/golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
func testSetGetenv(t *testing.T, key, value string) { func testSetGetenv(t *testing.T, key, value string) {

2
Godeps/_workspace/src/golang.org/x/sys/unix/syscall_unix_test.go generated vendored
View File

@ -18,7 +18,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/appc/cni/Godeps/_workspace/src/golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
// Tests that below functions, structures and constants are consistent // Tests that below functions, structures and constants are consistent

2
build
View File

@ -9,7 +9,7 @@ if [ ! -h gopath/src/${REPO_PATH} ]; then
fi fi
export GOBIN=${PWD}/bin export GOBIN=${PWD}/bin
export GOPATH=${PWD}/gopath export GOPATH=${PWD}/gopath:$(pwd)/Godeps/_workspace
echo "Building plugins" echo "Building plugins"

2
pkg/ip/ipmasq.go
View File

@ -18,7 +18,7 @@ import (
"fmt" "fmt"
"net" "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 // SetupIPMasq installs iptables rules to masquerade traffic

2
pkg/ip/link.go
View File

@ -20,7 +20,7 @@ import (
"net" "net"
"os" "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) { func makeVethPair(name, peer string, mtu int) (netlink.Link, error) {

2
pkg/ip/route.go
View File

@ -17,7 +17,7 @@ package ip
import ( import (
"net" "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. // AddDefaultRoute sets the default route on the given gateway.

2
pkg/plugin/ipam.go
View File

@ -23,8 +23,8 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink"
"github.com/appc/cni/pkg/ip" "github.com/appc/cni/pkg/ip"
"github.com/vishvananda/netlink"
) )
// Find returns the full path of the plugin by searching in CNI_PATH // Find returns the full path of the plugin by searching in CNI_PATH

2
plugins/ipam/dhcp/daemon.go
View File

@ -27,9 +27,9 @@ import (
"runtime" "runtime"
"sync" "sync"
"github.com/appc/cni/Godeps/_workspace/src/github.com/coreos/go-systemd/activation"
"github.com/appc/cni/pkg/plugin" "github.com/appc/cni/pkg/plugin"
"github.com/appc/cni/pkg/skel" "github.com/appc/cni/pkg/skel"
"github.com/coreos/go-systemd/activation"
) )
const listenFdsStart = 3 const listenFdsStart = 3

6
plugins/ipam/dhcp/lease.go
View File

@ -23,9 +23,9 @@ import (
"sync" "sync"
"time" "time"
"github.com/appc/cni/Godeps/_workspace/src/github.com/d2g/dhcp4" "github.com/d2g/dhcp4"
"github.com/appc/cni/Godeps/_workspace/src/github.com/d2g/dhcp4client" "github.com/d2g/dhcp4client"
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink" "github.com/vishvananda/netlink"
"github.com/appc/cni/pkg/ns" "github.com/appc/cni/pkg/ns"
"github.com/appc/cni/pkg/plugin" "github.com/appc/cni/pkg/plugin"

2
plugins/ipam/dhcp/options.go
View File

@ -20,8 +20,8 @@ import (
"net" "net"
"time" "time"
"github.com/appc/cni/Godeps/_workspace/src/github.com/d2g/dhcp4"
"github.com/appc/cni/pkg/plugin" "github.com/appc/cni/pkg/plugin"
"github.com/d2g/dhcp4"
) )
func parseRouter(opts dhcp4.Options) net.IP { func parseRouter(opts dhcp4.Options) net.IP {

2
plugins/ipam/dhcp/options_test.go
View File

@ -18,8 +18,8 @@ import (
"net" "net"
"testing" "testing"
"github.com/appc/cni/Godeps/_workspace/src/github.com/d2g/dhcp4"
"github.com/appc/cni/pkg/plugin" "github.com/appc/cni/pkg/plugin"
"github.com/d2g/dhcp4"
) )
func validateRoutes(t *testing.T, routes []plugin.Route) { func validateRoutes(t *testing.T, routes []plugin.Route) {

2
plugins/main/bridge/bridge.go
View File

@ -23,11 +23,11 @@ import (
"runtime" "runtime"
"syscall" "syscall"
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink"
"github.com/appc/cni/pkg/ip" "github.com/appc/cni/pkg/ip"
"github.com/appc/cni/pkg/ns" "github.com/appc/cni/pkg/ns"
"github.com/appc/cni/pkg/plugin" "github.com/appc/cni/pkg/plugin"
"github.com/appc/cni/pkg/skel" "github.com/appc/cni/pkg/skel"
"github.com/vishvananda/netlink"
) )
const defaultBrName = "cni0" const defaultBrName = "cni0"

2
plugins/main/ipvlan/ipvlan.go
View File

@ -21,11 +21,11 @@ import (
"os" "os"
"runtime" "runtime"
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink"
"github.com/appc/cni/pkg/ip" "github.com/appc/cni/pkg/ip"
"github.com/appc/cni/pkg/ns" "github.com/appc/cni/pkg/ns"
"github.com/appc/cni/pkg/plugin" "github.com/appc/cni/pkg/plugin"
"github.com/appc/cni/pkg/skel" "github.com/appc/cni/pkg/skel"
"github.com/vishvananda/netlink"
) )
type NetConf struct { type NetConf struct {

2
plugins/main/macvlan/macvlan.go
View File

@ -21,11 +21,11 @@ import (
"os" "os"
"runtime" "runtime"
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink"
"github.com/appc/cni/pkg/ip" "github.com/appc/cni/pkg/ip"
"github.com/appc/cni/pkg/ns" "github.com/appc/cni/pkg/ns"
"github.com/appc/cni/pkg/plugin" "github.com/appc/cni/pkg/plugin"
"github.com/appc/cni/pkg/skel" "github.com/appc/cni/pkg/skel"
"github.com/vishvananda/netlink"
) )
type NetConf struct { type NetConf struct {

2
plugins/main/veth/veth.go
View File

@ -23,7 +23,7 @@ import (
"os" "os"
"runtime" "runtime"
"github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink" "github.com/vishvananda/netlink"
"github.com/appc/cni/pkg/ip" "github.com/appc/cni/pkg/ip"
"github.com/appc/cni/pkg/ns" "github.com/appc/cni/pkg/ns"