From a11ea4e45f864284dbbf6f1cfe89bb4392cfdde4 Mon Sep 17 00:00:00 2001
From: Christoph Blecker <admin@toph.ca>
Date: Thu, 15 Feb 2018 13:30:30 -0800
Subject: [PATCH] Enforce OWNERS file in Godeps and vendor dirs

---
 hack/godep-save.sh    | 11 ++++++++++-
 hack/verify-godeps.sh |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/hack/godep-save.sh b/hack/godep-save.sh
index 7d154404edd..51ddd0f0635 100755
--- a/hack/godep-save.sh
+++ b/hack/godep-save.sh
@@ -20,7 +20,6 @@ set -o pipefail
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
 source "${KUBE_ROOT}/hack/lib/init.sh"
-source "${KUBE_ROOT}/hack/lib/util.sh"
 
 kube::log::status "Ensuring prereqs"
 kube::util::ensure_single_dir_gopath
@@ -86,5 +85,15 @@ hack/update-bazel.sh >/dev/null
 kube::log::status "Updating LICENSES file"
 hack/update-godep-licenses.sh >/dev/null
 
+kube::log::status "Creating OWNERS file"
+rm -f "Godeps/OWNERS" "vendor/OWNERS"
+cat <<__EOF__ > "Godeps/OWNERS"
+reviewers:
+- dep-reviewers
+approvers:
+- dep-approvers
+__EOF__
+cp "Godeps/OWNERS" "vendor/OWNERS"
+
 # Clean up
 rm -rf "${BACKUP}"
diff --git a/hack/verify-godeps.sh b/hack/verify-godeps.sh
index e520e1e0736..b03826e7449 100755
--- a/hack/verify-godeps.sh
+++ b/hack/verify-godeps.sh
@@ -101,7 +101,7 @@ pushd "${KUBE_ROOT}" 2>&1 > /dev/null
     ret=1
   fi
 
-  if ! _out="$(diff -Naupr -x "BUILD" -x "OWNERS" -x "AUTHORS*" -x "CONTRIBUTORS*" vendor ${_kubetmp}/vendor)"; then
+  if ! _out="$(diff -Naupr -x "BUILD" -x "AUTHORS*" -x "CONTRIBUTORS*" vendor ${_kubetmp}/vendor)"; then
     echo "Your vendored results are different:" >&2
     echo "${_out}" >&2
     echo "Godeps Verify failed." >&2