From 5b12a2abb991f72f755e7f13747eef53b866dcf6 Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@google.com>
Date: Tue, 31 Jan 2017 16:41:54 -0800
Subject: [PATCH] have multiple BUILD files in vendor/

---
 .gazelcfg.json           | 7 +++++--
 Makefile                 | 4 ++--
 build/release-tars/BUILD | 2 +-
 test/e2e/generated/BUILD | 6 +++---
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.gazelcfg.json b/.gazelcfg.json
index fa760deb5d..b2c47d3603 100644
--- a/.gazelcfg.json
+++ b/.gazelcfg.json
@@ -10,7 +10,10 @@
 		"./examples"
 	],
 	"SkippedPaths": [
-		"^_.*"
+		"^_.*",
+		"^staging.*",
+		"_vendor"
 	],
-	"AddSourcesRules": true
+	"AddSourcesRules": true,
+	"VendorMultipleBuildFiles": true
 }
diff --git a/Makefile b/Makefile
index 89b027c76c..d2305d54de 100644
--- a/Makefile
+++ b/Makefile
@@ -500,7 +500,7 @@ bazel-build:
 	@echo "$$BAZEL_BUILD_HELP_INFO"
 else
 bazel-build:
-	bazel build //cmd/... //pkg/... //federation/... //plugin/... //third_party/... //examples/... //test/...
+	bazel build //cmd/... //pkg/... //federation/... //plugin/... //third_party/... //examples/... //test/... //vendor/k8s.io/...
 endif
 
 
@@ -515,7 +515,7 @@ bazel-test:
 	@echo "$$BAZEL_TEST_HELP_INFO"
 else
 bazel-test:
-	bazel test --flaky_test_attempts=3 //cmd/... //pkg/... //federation/... //plugin/... //third_party/... //hack/... //hack:verify-all
+	bazel test --flaky_test_attempts=3 //cmd/... //pkg/... //federation/... //plugin/... //third_party/... //hack/... //hack:verify-all //vendor/k8s.io/...
 endif
 
 ifeq ($(PRINT_HELP),y)
diff --git a/build/release-tars/BUILD b/build/release-tars/BUILD
index ac3c3b5488..1ffb01713c 100644
--- a/build/release-tars/BUILD
+++ b/build/release-tars/BUILD
@@ -87,7 +87,7 @@ TEST_BINARY_TARGETS = [
     "//examples/k8petstore/web-server/src",
     "//federation/cmd/genfeddocs",
     "//test/e2e:e2e.test",
-    "//vendor:github.com/onsi/ginkgo/ginkgo_bin",
+    "//vendor/github.com/onsi/ginkgo/ginkgo:ginkgo",
     "//cmd/kubemark",  # TODO: server platforms only
     "//test/e2e_node:e2e_node.test",  # TODO: server platforms only
 ]
diff --git a/test/e2e/generated/BUILD b/test/e2e/generated/BUILD
index ad4e18aa69..dc3bd38614 100644
--- a/test/e2e/generated/BUILD
+++ b/test/e2e/generated/BUILD
@@ -15,7 +15,7 @@ go_library(
         ":bindata",
     ],
     deps = [
-        "//vendor:github.com/golang/glog",
+        "//vendor/github.com/golang/glog:go_default_library",
     ],
 )
 
@@ -29,14 +29,14 @@ genrule(
     ],
     outs = ["bindata.go"],
     cmd = """
-$(location //vendor:github.com/jteeuwen/go-bindata/go-bindata_bin) \
+$(location //vendor/github.com/jteeuwen/go-bindata/go-bindata:go-bindata) \
   -nometadata -o "$(OUTS)" -pkg generated \
   -prefix $$(pwd) \
   -ignore .jpg -ignore .png -ignore .md \
   $(SRCS)
 """,
     tools = [
-        "//vendor:github.com/jteeuwen/go-bindata/go-bindata_bin",
+        "//vendor/github.com/jteeuwen/go-bindata/go-bindata",
     ],
 )