Merge pull request #303 from stu-gott/govendor2glide

Govendor2glide

.travis.yml

@@ -19,7 +19,7 @@ before_install:
 install:
  - git reset --hard # we are caching the vendor folder, make sure we see the new vendor.json file
  - go get github.com/mattn/goveralls
- - go get -u github.com/kardianos/govendor
+ - go get -u github.com/Masterminds/glide
  - go get golang.org/x/tools/cmd/goimports
  - go get -u github.com/golang/mock/gomock
  - go get -u github.com/rmohr/mock/mockgen

Makefile

@@ -30,7 +30,7 @@ distclean: clean
 	rm -f manifest/*.yaml
 
 sync:
-	govendor sync
+	glide install
 
 docker: build
 	./hack/build-docker.sh build ${WHAT}

Vagrantfile

@@ -38,7 +38,7 @@ Vagrant.configure(2) do |config|
   if $use_nfs then
     config.vm.synced_folder "./", "/vagrant", type: "nfs"
   else
-          config.vm.synced_folder "./", "/vagrant", type: "rsync", rsync__exclude: [ "cluster/vagrant/.kubectl", "cluster/vagrant/.kubeconfig", ".vagrant" ]
+          config.vm.synced_folder "./", "/vagrant", type: "rsync", rsync__exclude: [ "cluster/vagrant/.kubectl", "cluster/vagrant/.kubeconfig", ".vagrant", "vendor"]
   end
 
   config.vm.provision "shell", inline: <<-SHELL

automation/check-merged.sh

@@ -70,7 +70,7 @@ set -e
 
 # Build kubevirt
 go get golang.org/x/tools/cmd/goimports
-go get -u github.com/kardianos/govendor
+go get -u github.com/Masterminds/glide
 make
 
 # Copy connection details for kubernetes

docs/getting-started.md

@@ -59,10 +59,15 @@ to install a few build requirements:
     cd $GOPATH
     # Use goimports for package import ordering
     go get golang.org/x/tools/cmd/goimports
-    # Setup govendor which is used to track dependencies
-    go get -u github.com/kardianos/govendor
+    # Setup glide which is used to track dependencies
+    go get github.com/Masterminds/glide
 ```
 
+**Note:** Make sure you're using the glide version from your $GOPATH. If you
+have a version installed via your system's package manager, it's likely older
+and might not be able to work with k8s.io/client-go.
+[Github Issue](https://github.com/Masterminds/glide/issues/615)
+
 ### Sources
 
 Now we can clone the project into your `$GOPATH`: