From d3bcd367ecc650e8ee1e3103a4ac6100f6b33cb3 Mon Sep 17 00:00:00 2001
From: Christoph Blecker <admin@toph.ca>
Date: Thu, 15 Feb 2018 13:29:29 -0800
Subject: [PATCH 1/3] Add cblecker to dep approvers

---
 OWNERS_ALIASES | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index e86b3f615a1..d8656aa20bf 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -223,7 +223,9 @@ aliases:
     - piosz
     - jsafrane
     - jbeda
-  vendor-reviewers:
+  dep-reviewers:
+    - cblecker
     - thockin
-  vendor-approvers:
+  dep-approvers:
+    - cblecker
     - thockin

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 2/3] 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

From 6fb2304f2a6da44e42985ed662d5f7f56215eec6 Mon Sep 17 00:00:00 2001
From: Christoph Blecker <admin@toph.ca>
Date: Thu, 15 Feb 2018 13:31:02 -0800
Subject: [PATCH 3/3] Re-add OWNERS files to Godeps/vendor dirs

---
 Godeps/OWNERS                                            | 4 ++++
 staging/src/k8s.io/api/Godeps/OWNERS                     | 4 ++++
 staging/src/k8s.io/apiextensions-apiserver/Godeps/OWNERS | 4 ++++
 staging/src/k8s.io/apimachinery/Godeps/OWNERS            | 4 ++++
 staging/src/k8s.io/apiserver/Godeps/OWNERS               | 4 ++++
 staging/src/k8s.io/client-go/Godeps/OWNERS               | 4 ++++
 staging/src/k8s.io/code-generator/Godeps/OWNERS          | 4 ++++
 staging/src/k8s.io/kube-aggregator/Godeps/OWNERS         | 4 ++++
 staging/src/k8s.io/metrics/Godeps/OWNERS                 | 4 ++++
 staging/src/k8s.io/sample-apiserver/Godeps/OWNERS        | 4 ++++
 staging/src/k8s.io/sample-controller/Godeps/OWNERS       | 4 ++++
 vendor/OWNERS                                            | 4 ++++
 12 files changed, 48 insertions(+)
 create mode 100644 Godeps/OWNERS
 create mode 100644 staging/src/k8s.io/api/Godeps/OWNERS
 create mode 100644 staging/src/k8s.io/apiextensions-apiserver/Godeps/OWNERS
 create mode 100644 staging/src/k8s.io/apimachinery/Godeps/OWNERS
 create mode 100644 staging/src/k8s.io/apiserver/Godeps/OWNERS
 create mode 100644 staging/src/k8s.io/client-go/Godeps/OWNERS
 create mode 100644 staging/src/k8s.io/code-generator/Godeps/OWNERS
 create mode 100644 staging/src/k8s.io/kube-aggregator/Godeps/OWNERS
 create mode 100644 staging/src/k8s.io/metrics/Godeps/OWNERS
 create mode 100644 staging/src/k8s.io/sample-apiserver/Godeps/OWNERS
 create mode 100644 staging/src/k8s.io/sample-controller/Godeps/OWNERS
 create mode 100644 vendor/OWNERS

diff --git a/Godeps/OWNERS b/Godeps/OWNERS
new file mode 100644
index 00000000000..ca3bdf4cc79
--- /dev/null
+++ b/Godeps/OWNERS
@@ -0,0 +1,4 @@
+reviewers:
+- dep-reviewers
+approvers:
+- dep-approvers
diff --git a/staging/src/k8s.io/api/Godeps/OWNERS b/staging/src/k8s.io/api/Godeps/OWNERS
new file mode 100644
index 00000000000..ca3bdf4cc79
--- /dev/null
+++ b/staging/src/k8s.io/api/Godeps/OWNERS
@@ -0,0 +1,4 @@
+reviewers:
+- dep-reviewers
+approvers:
+- dep-approvers
diff --git a/staging/src/k8s.io/apiextensions-apiserver/Godeps/OWNERS b/staging/src/k8s.io/apiextensions-apiserver/Godeps/OWNERS
new file mode 100644
index 00000000000..ca3bdf4cc79
--- /dev/null
+++ b/staging/src/k8s.io/apiextensions-apiserver/Godeps/OWNERS
@@ -0,0 +1,4 @@
+reviewers:
+- dep-reviewers
+approvers:
+- dep-approvers
diff --git a/staging/src/k8s.io/apimachinery/Godeps/OWNERS b/staging/src/k8s.io/apimachinery/Godeps/OWNERS
new file mode 100644
index 00000000000..ca3bdf4cc79
--- /dev/null
+++ b/staging/src/k8s.io/apimachinery/Godeps/OWNERS
@@ -0,0 +1,4 @@
+reviewers:
+- dep-reviewers
+approvers:
+- dep-approvers
diff --git a/staging/src/k8s.io/apiserver/Godeps/OWNERS b/staging/src/k8s.io/apiserver/Godeps/OWNERS
new file mode 100644
index 00000000000..ca3bdf4cc79
--- /dev/null
+++ b/staging/src/k8s.io/apiserver/Godeps/OWNERS
@@ -0,0 +1,4 @@
+reviewers:
+- dep-reviewers
+approvers:
+- dep-approvers
diff --git a/staging/src/k8s.io/client-go/Godeps/OWNERS b/staging/src/k8s.io/client-go/Godeps/OWNERS
new file mode 100644
index 00000000000..ca3bdf4cc79
--- /dev/null
+++ b/staging/src/k8s.io/client-go/Godeps/OWNERS
@@ -0,0 +1,4 @@
+reviewers:
+- dep-reviewers
+approvers:
+- dep-approvers
diff --git a/staging/src/k8s.io/code-generator/Godeps/OWNERS b/staging/src/k8s.io/code-generator/Godeps/OWNERS
new file mode 100644
index 00000000000..ca3bdf4cc79
--- /dev/null
+++ b/staging/src/k8s.io/code-generator/Godeps/OWNERS
@@ -0,0 +1,4 @@
+reviewers:
+- dep-reviewers
+approvers:
+- dep-approvers
diff --git a/staging/src/k8s.io/kube-aggregator/Godeps/OWNERS b/staging/src/k8s.io/kube-aggregator/Godeps/OWNERS
new file mode 100644
index 00000000000..ca3bdf4cc79
--- /dev/null
+++ b/staging/src/k8s.io/kube-aggregator/Godeps/OWNERS
@@ -0,0 +1,4 @@
+reviewers:
+- dep-reviewers
+approvers:
+- dep-approvers
diff --git a/staging/src/k8s.io/metrics/Godeps/OWNERS b/staging/src/k8s.io/metrics/Godeps/OWNERS
new file mode 100644
index 00000000000..ca3bdf4cc79
--- /dev/null
+++ b/staging/src/k8s.io/metrics/Godeps/OWNERS
@@ -0,0 +1,4 @@
+reviewers:
+- dep-reviewers
+approvers:
+- dep-approvers
diff --git a/staging/src/k8s.io/sample-apiserver/Godeps/OWNERS b/staging/src/k8s.io/sample-apiserver/Godeps/OWNERS
new file mode 100644
index 00000000000..ca3bdf4cc79
--- /dev/null
+++ b/staging/src/k8s.io/sample-apiserver/Godeps/OWNERS
@@ -0,0 +1,4 @@
+reviewers:
+- dep-reviewers
+approvers:
+- dep-approvers
diff --git a/staging/src/k8s.io/sample-controller/Godeps/OWNERS b/staging/src/k8s.io/sample-controller/Godeps/OWNERS
new file mode 100644
index 00000000000..ca3bdf4cc79
--- /dev/null
+++ b/staging/src/k8s.io/sample-controller/Godeps/OWNERS
@@ -0,0 +1,4 @@
+reviewers:
+- dep-reviewers
+approvers:
+- dep-approvers
diff --git a/vendor/OWNERS b/vendor/OWNERS
new file mode 100644
index 00000000000..ca3bdf4cc79
--- /dev/null
+++ b/vendor/OWNERS
@@ -0,0 +1,4 @@
+reviewers:
+- dep-reviewers
+approvers:
+- dep-approvers