From 6ad4544778101ae06aaa74309852e7be46149aab Mon Sep 17 00:00:00 2001
From: Christoph Blecker <admin@toph.ca>
Date: Wed, 19 Jul 2017 15:54:59 -0700
Subject: [PATCH 1/3] Use absolute path when updating staging godeps

---
 hack/update-staging-godeps.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hack/update-staging-godeps.sh b/hack/update-staging-godeps.sh
index 18f1ddd51b1..03c7ec1be80 100755
--- a/hack/update-staging-godeps.sh
+++ b/hack/update-staging-godeps.sh
@@ -94,9 +94,9 @@ for repo in $(ls ${KUBE_ROOT}/staging/src/k8s.io); do
   updateGodepManifest "${repo}"
 
   if [ "${FAIL_ON_DIFF}" == true ]; then
-    diff --ignore-matching-lines='^\s*\"GoVersion\":' --ignore-matching-line='^\s*\"GodepVersion\":' --ignore-matching-lines='^\s*\"Comment\"' -u "${KUBE_ROOT}/staging/src/k8s.io/${repo}/Godeps" "${TMP_GOPATH}/src/k8s.io/${repo}/Godeps/Godeps.json"
+    diff --ignore-matching-lines='^\s*\"GoVersion\":' --ignore-matching-line='^\s*\"GodepVersion\":' --ignore-matching-lines='^\s*\"Comment\"' -u "${KUBE_ROOT}/staging/src/k8s.io/${repo}/Godeps/Godeps.json" "${TMP_GOPATH}/src/k8s.io/${repo}/Godeps/Godeps.json"
   fi
   if [ "${DRY_RUN}" != true ]; then
-    cp "${TMP_GOPATH}/src/k8s.io/${repo}/Godeps/Godeps.json" "${KUBE_ROOT}/staging/src/k8s.io/${repo}/Godeps"
+    cp "${TMP_GOPATH}/src/k8s.io/${repo}/Godeps/Godeps.json" "${KUBE_ROOT}/staging/src/k8s.io/${repo}/Godeps/Godeps.json"
   fi
 done

From 6e3d7551521d3ffec516b97243f79cc12033296b Mon Sep 17 00:00:00 2001
From: Christoph Blecker <admin@toph.ca>
Date: Wed, 19 Jul 2017 15:44:32 -0700
Subject: [PATCH 2/3] Move Godeps.json into correct path for metrics and
 kube-gen

---
 staging/src/k8s.io/kube-gen/{Godeps => Godeps/Godeps.json} | 0
 staging/src/k8s.io/metrics/{Godeps => Godeps/Godeps.json}  | 0
 staging/src/k8s.io/metrics/Godeps/Readme                   | 5 +++++
 3 files changed, 5 insertions(+)
 rename staging/src/k8s.io/kube-gen/{Godeps => Godeps/Godeps.json} (100%)
 rename staging/src/k8s.io/metrics/{Godeps => Godeps/Godeps.json} (100%)
 create mode 100644 staging/src/k8s.io/metrics/Godeps/Readme

diff --git a/staging/src/k8s.io/kube-gen/Godeps b/staging/src/k8s.io/kube-gen/Godeps/Godeps.json
similarity index 100%
rename from staging/src/k8s.io/kube-gen/Godeps
rename to staging/src/k8s.io/kube-gen/Godeps/Godeps.json
diff --git a/staging/src/k8s.io/metrics/Godeps b/staging/src/k8s.io/metrics/Godeps/Godeps.json
similarity index 100%
rename from staging/src/k8s.io/metrics/Godeps
rename to staging/src/k8s.io/metrics/Godeps/Godeps.json
diff --git a/staging/src/k8s.io/metrics/Godeps/Readme b/staging/src/k8s.io/metrics/Godeps/Readme
new file mode 100644
index 00000000000..4cdaa53d56d
--- /dev/null
+++ b/staging/src/k8s.io/metrics/Godeps/Readme
@@ -0,0 +1,5 @@
+This directory tree is generated automatically by godep.
+
+Please do not edit.
+
+See https://github.com/tools/godep for more information.

From 1cacb5cec2b267c2c2b4e446b1e43545bd6247b2 Mon Sep 17 00:00:00 2001
From: Christoph Blecker <admin@toph.ca>
Date: Wed, 19 Jul 2017 15:53:22 -0700
Subject: [PATCH 3/3] Add Readme files to staging Godeps

---
 staging/src/k8s.io/api/Godeps/Readme                     | 5 +++++
 staging/src/k8s.io/apiextensions-apiserver/Godeps/Readme | 5 +++++
 staging/src/k8s.io/kube-gen/Godeps/Readme                | 5 +++++
 3 files changed, 15 insertions(+)
 create mode 100644 staging/src/k8s.io/api/Godeps/Readme
 create mode 100644 staging/src/k8s.io/apiextensions-apiserver/Godeps/Readme
 create mode 100644 staging/src/k8s.io/kube-gen/Godeps/Readme

diff --git a/staging/src/k8s.io/api/Godeps/Readme b/staging/src/k8s.io/api/Godeps/Readme
new file mode 100644
index 00000000000..4cdaa53d56d
--- /dev/null
+++ b/staging/src/k8s.io/api/Godeps/Readme
@@ -0,0 +1,5 @@
+This directory tree is generated automatically by godep.
+
+Please do not edit.
+
+See https://github.com/tools/godep for more information.
diff --git a/staging/src/k8s.io/apiextensions-apiserver/Godeps/Readme b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Readme
new file mode 100644
index 00000000000..4cdaa53d56d
--- /dev/null
+++ b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Readme
@@ -0,0 +1,5 @@
+This directory tree is generated automatically by godep.
+
+Please do not edit.
+
+See https://github.com/tools/godep for more information.
diff --git a/staging/src/k8s.io/kube-gen/Godeps/Readme b/staging/src/k8s.io/kube-gen/Godeps/Readme
new file mode 100644
index 00000000000..4cdaa53d56d
--- /dev/null
+++ b/staging/src/k8s.io/kube-gen/Godeps/Readme
@@ -0,0 +1,5 @@
+This directory tree is generated automatically by godep.
+
+Please do not edit.
+
+See https://github.com/tools/godep for more information.