BUILDS: Use vendor directory instead of Godeps

Keep the Godeps.json but store files in the vendor directly. This means that there is no longer a need to rewrite import paths.
flannel-io · Jun 14, 2016 · f0f4dfb · f0f4dfb
1 parent 6c95ca9
commit f0f4dfb
Show file tree

Hide file tree

Showing 282 changed files with 242 additions and 249 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: go
 go:
-  - 1.4
-  - 1.5
+  - 1.6
 
 install:
  - go get golang.org/x/tools/cmd/cover 

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/Readme b/Godeps/Readme
diff --git a/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore
diff --git a/backend/alloc/alloc.go b/backend/alloc/alloc.go
@@ -17,7 +17,7 @@ package alloc
 import (
 	"fmt"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"golang.org/x/net/context"
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"

diff --git a/backend/awsvpc/awsvpc.go b/backend/awsvpc/awsvpc.go
@@ -18,12 +18,12 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/ec2metadata"
+	"github.com/aws/aws-sdk-go/service/ec2"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"

diff --git a/backend/awsvpc/filter.go b/backend/awsvpc/filter.go
@@ -14,7 +14,7 @@
 
 package awsvpc
 
-import "github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2"
+import "github.com/aws/aws-sdk-go/service/ec2"
 
 type ecFilter []*ec2.Filter
 

diff --git a/backend/common.go b/backend/common.go
@@ -17,7 +17,7 @@ package backend
 import (
 	"net"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/subnet"
 )

diff --git a/backend/gce/api.go b/backend/gce/api.go
@@ -18,9 +18,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/code.google.com/p/goauth2/compute/serviceaccount"
-	"github.com/coreos/flannel/Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
+	"code.google.com/p/goauth2/compute/serviceaccount"
+	"code.google.com/p/google-api-go-client/compute/v1"
+	log "github.com/golang/glog"
 )
 
 type gceAPI struct {

diff --git a/backend/gce/gce.go b/backend/gce/gce.go
@@ -42,9 +42,9 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"code.google.com/p/google-api-go-client/googleapi"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"

diff --git a/backend/hostgw/hostgw.go b/backend/hostgw/hostgw.go
@@ -17,7 +17,7 @@ package hostgw
 import (
 	"fmt"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"golang.org/x/net/context"
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"

diff --git a/backend/hostgw/network.go b/backend/hostgw/network.go
@@ -20,9 +20,9 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	log "github.com/golang/glog"
+	"github.com/vishvananda/netlink"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/subnet"

diff --git a/backend/manager.go b/backend/manager.go
@@ -19,8 +19,8 @@ import (
 	"strings"
 	"sync"
 
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/subnet"
 )

diff --git a/backend/udp/cproxy.go b/backend/udp/cproxy.go
@@ -23,7 +23,7 @@ import (
 	"reflect"
 	"unsafe"
 
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
+	log "github.com/golang/glog"
 
 	"github.com/coreos/flannel/pkg/ip"
 )

diff --git a/backend/udp/network.go b/backend/udp/network.go
@@ -21,9 +21,9 @@ import (
 	"sync"
 	"syscall"
 
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	log "github.com/golang/glog"
+	"github.com/vishvananda/netlink"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"

diff --git a/backend/udp/udp.go b/backend/udp/udp.go
@@ -18,7 +18,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"

diff --git a/backend/vxlan/device.go b/backend/vxlan/device.go
@@ -21,9 +21,9 @@ import (
 	"syscall"
 	"time"
 
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+	log "github.com/golang/glog"
+	"github.com/vishvananda/netlink"
+	"github.com/vishvananda/netlink/nl"
 
 	"github.com/coreos/flannel/pkg/ip"
 )

diff --git a/backend/vxlan/network.go b/backend/vxlan/network.go
@@ -22,9 +22,9 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	log "github.com/golang/glog"
+	"github.com/vishvananda/netlink"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"

diff --git a/backend/vxlan/vxlan.go b/backend/vxlan/vxlan.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"

diff --git a/main.go b/main.go
@@ -23,9 +23,9 @@ import (
 	"sync"
 	"syscall"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/pkg/flagutil"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/coreos/pkg/flagutil"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/network"
 	"github.com/coreos/flannel/remote"

diff --git a/network/ipmasq.go b/network/ipmasq.go
@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/go-iptables/iptables"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
+	"github.com/coreos/go-iptables/iptables"
+	log "github.com/golang/glog"
 
 	"github.com/coreos/flannel/pkg/ip"
 )

diff --git a/network/manager.go b/network/manager.go
@@ -26,9 +26,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/go-systemd/daemon"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/coreos/go-systemd/daemon"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"

diff --git a/network/network.go b/network/network.go
@@ -20,8 +20,8 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/subnet"

diff --git a/pkg/ip/iface.go b/pkg/ip/iface.go
@@ -19,7 +19,7 @@ import (
 	"net"
 	"syscall"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink"
+	"github.com/vishvananda/netlink"
 )
 
 func getIfaceAddrs(iface *net.Interface) ([]netlink.Addr, error) {

diff --git a/remote/client.go b/remote/client.go
@@ -25,8 +25,8 @@ import (
 	"path"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/coreos/etcd/pkg/transport"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"

diff --git a/remote/http_logger.go b/remote/http_logger.go
@@ -15,7 +15,7 @@
 package remote
 
 import (
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
+	log "github.com/golang/glog"
 	"net/http"
 )
 

diff --git a/remote/remote_test.go b/remote/remote_test.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"

diff --git a/remote/server.go b/remote/server.go
@@ -24,12 +24,12 @@ import (
 	"regexp"
 	"strconv"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/go-systemd/activation"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/go-systemd/daemon"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/gorilla/mux"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/coreos/etcd/pkg/transport"
+	"github.com/coreos/go-systemd/activation"
+	"github.com/coreos/go-systemd/daemon"
+	log "github.com/golang/glog"
+	"github.com/gorilla/mux"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/subnet"
 )

diff --git a/subnet/clock.go b/subnet/clock.go
@@ -14,6 +14,6 @@
 
 package subnet
 
-import "github.com/coreos/flannel/Godeps/_workspace/src/github.com/jonboulle/clockwork"
+import "github.com/jonboulle/clockwork"
 
 var clock clockwork.Clock = clockwork.NewRealClock()
diff --git a/subnet/local_manager.go b/subnet/local_manager.go
@@ -20,10 +20,10 @@ import (
 	"strconv"
 	"time"
 
-	etcd "github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/client"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	etcd "github.com/coreos/etcd/client"
 	"github.com/coreos/flannel/pkg/ip"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 )
 
 const (

diff --git a/subnet/mock_etcd.go b/subnet/mock_etcd.go
@@ -20,8 +20,8 @@ import (
 	"sync"
 	"time"
 
-	etcd "github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/client"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	etcd "github.com/coreos/etcd/client"
+	"golang.org/x/net/context"
 )
 
 const DEFAULT_TTL time.Duration = 8760 * time.Hour // one year

diff --git a/subnet/mock_etcd_test.go b/subnet/mock_etcd_test.go
@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"testing"
 
-	etcd "github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/client"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	etcd "github.com/coreos/etcd/client"
+	"golang.org/x/net/context"
 )
 
 func expectSuccess(t *testing.T, r *etcd.Response, err error, expected *etcd.Response, expectedValue string) {

diff --git a/subnet/mock_registry.go b/subnet/mock_registry.go
@@ -20,8 +20,8 @@ import (
 	"sync"
 	"time"
 
-	etcd "github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/client"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	etcd "github.com/coreos/etcd/client"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/pkg/ip"
 )

diff --git a/subnet/registry.go b/subnet/registry.go
@@ -23,10 +23,10 @@ import (
 	"sync"
 	"time"
 
-	etcd "github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/client"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	etcd "github.com/coreos/etcd/client"
+	"github.com/coreos/etcd/pkg/transport"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/pkg/ip"
 )

diff --git a/subnet/registry_test.go b/subnet/registry_test.go
@@ -20,8 +20,8 @@ import (
 	"testing"
 	"time"
 
-	etcd "github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/client"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	etcd "github.com/coreos/etcd/client"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/pkg/ip"
 )

diff --git a/subnet/subnet.go b/subnet/subnet.go
@@ -22,8 +22,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
 	"github.com/coreos/flannel/pkg/ip"
+	"golang.org/x/net/context"
 )
 
 var (