From 7015f191efffd4c85b70a9db0d1c10aa857bb028 Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Wed, 21 Mar 2018 16:28:06 -0700
Subject: [PATCH 1/3] Remove all upstream BUILD, BUILD.bazel, and WORKSPACE
 files from vendor/

---
 hack/godep-save.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hack/godep-save.sh b/hack/godep-save.sh
index a7146f13bda..2457438766f 100755
--- a/hack/godep-save.sh
+++ b/hack/godep-save.sh
@@ -81,6 +81,11 @@ done
 rm -rf vendor/github.com/docker/docker/project/
 
 kube::log::status "Updating BUILD files"
+# Assume that anything imported through godep doesn't need Bazel to build.
+# Prune out any Bazel build files, since these can break the build due to
+# missing dependencies that aren't included by godep.
+find vendor/ -type f \( -name BUILD -o -name BUILD.bazel -o -name WORKSPACE \) \
+  -exec rm -f {} \;
 hack/update-bazel.sh >/dev/null
 
 kube::log::status "Updating LICENSES file"

From 009134a30427b73c42a4ae9599abb6b874342f2b Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Thu, 22 Mar 2018 15:49:32 -0700
Subject: [PATCH 2/3] Update to gazelle 0.10.1

---
 hack/update-bazel.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hack/update-bazel.sh b/hack/update-bazel.sh
index 25c858f7dfe..88895ee5e23 100755
--- a/hack/update-bazel.sh
+++ b/hack/update-bazel.sh
@@ -32,7 +32,7 @@ kube::util::go_install_from_commit \
     97099dccc8807e9159dc28f374a8f0602cab07e1
 kube::util::go_install_from_commit \
     github.com/bazelbuild/bazel-gazelle/cmd/gazelle \
-    578e73e57d6a4054ef933db1553405c9284322c7
+    0.10.1
 
 touch "${KUBE_ROOT}/vendor/BUILD"
 

From f7ec474dec8d4151bd753c30fadb4d9f7bc3b578 Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Wed, 21 Mar 2018 16:44:44 -0700
Subject: [PATCH 3/3] run hack/godep-restore.sh && hack/godep-save.sh

---
 Godeps/Godeps.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 67330aae099..7b8bc58998a 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1976,6 +1976,7 @@
 		},
 		{
 			"ImportPath": "github.com/inconshreveable/mousetrap",
+			"Comment": "v1.0",
 			"Rev": "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
 		},
 		{
@@ -2456,6 +2457,7 @@
 		},
 		{
 			"ImportPath": "github.com/pelletier/go-buffruneio",
+			"Comment": "v0.1.0",
 			"Rev": "df1e16fde7fc330a0ca68167c23bf7ed6ac31d6d"
 		},
 		{
@@ -2805,6 +2807,7 @@
 		},
 		{
 			"ImportPath": "github.com/xiang90/probing",
+			"Comment": "0.0.1",
 			"Rev": "07dd2e8dfe18522e9c447ba95f2fe95262f63bb2"
 		},
 		{