Merge pull request #5821 from justinsb/bazel_cleanup

Prune some broken files out of vendor
kubernetes · Sep 23, 2018 · b0507b4 · b0507b4
2 parents d9617c3 + e7f64c3
commit b0507b4
Show file tree

Hide file tree

Showing 27 changed files with 7 additions and 2,411 deletions.
diff --git a/Makefile b/Makefile
@@ -477,6 +477,13 @@ dep-ensure: dep-prereqs
 	# Remove all bazel build files that were vendored and regenerate (we assume they are go-gettable)
 	find vendor/ -name "BUILD" -delete
 	find vendor/ -name "BUILD.bazel" -delete
+	# Remove recursive symlinks that really confuse bazel
+	rm -rf vendor/github.com/coreos/etcd/cmd/
+	rm -rf vendor/github.com/jteeuwen/go-bindata/testdata/
+	# Remove depenencies that dep just can't figure out
+	rm -rf vendor/k8s.io/code-generator/cmd/set-gen/
+	rm -rf vendor/k8s.io/code-generator/cmd/go-to-protobuf/
+	rm -rf vendor/k8s.io/code-generator/cmd/import-boss/
 	make bazel-gazelle
 
 

diff --git a/vendor/github.com/coreos/etcd/cmd/etcd b/vendor/github.com/coreos/etcd/cmd/etcd
diff --git a/vendor/github.com/coreos/etcd/cmd/etcdctl b/vendor/github.com/coreos/etcd/cmd/etcdctl
diff --git a/vendor/github.com/coreos/etcd/cmd/tools b/vendor/github.com/coreos/etcd/cmd/tools
diff --git a/vendor/github.com/jteeuwen/go-bindata/testdata/symlinkFile/file1 b/vendor/github.com/jteeuwen/go-bindata/testdata/symlinkFile/file1
diff --git a/vendor/github.com/jteeuwen/go-bindata/testdata/symlinkParent/symlinkTarget b/vendor/github.com/jteeuwen/go-bindata/testdata/symlinkParent/symlinkTarget
diff --git a/vendor/github.com/jteeuwen/go-bindata/testdata/symlinkRecursiveParent/symlinkTarget b/vendor/github.com/jteeuwen/go-bindata/testdata/symlinkRecursiveParent/symlinkTarget
diff --git a/vendor/k8s.io/code-generator/cmd/go-to-protobuf/.gitignore b/vendor/k8s.io/code-generator/cmd/go-to-protobuf/.gitignore
diff --git a/vendor/k8s.io/code-generator/cmd/go-to-protobuf/BUILD.bazel b/vendor/k8s.io/code-generator/cmd/go-to-protobuf/BUILD.bazel
diff --git a/vendor/k8s.io/code-generator/cmd/go-to-protobuf/OWNERS b/vendor/k8s.io/code-generator/cmd/go-to-protobuf/OWNERS
diff --git a/vendor/k8s.io/code-generator/cmd/go-to-protobuf/main.go b/vendor/k8s.io/code-generator/cmd/go-to-protobuf/main.go
diff --git a/vendor/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/BUILD.bazel b/vendor/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/BUILD.bazel