From 4fb2265bd86d053843302fc75207efa3958d018f Mon Sep 17 00:00:00 2001
From: Christoph Blecker <admin@toph.ca>
Date: Tue, 30 Jan 2018 07:42:39 -0800
Subject: [PATCH 1/3] Don't go get godep in jenkins scripts

---
 hack/jenkins/benchmark-dockerized.sh | 1 -
 hack/jenkins/test-dockerized.sh      | 1 -
 hack/jenkins/verify-dockerized.sh    | 2 --
 hack/jenkins/verify.sh               | 1 -
 4 files changed, 5 deletions(-)

diff --git a/hack/jenkins/benchmark-dockerized.sh b/hack/jenkins/benchmark-dockerized.sh
index b092e6d53b6..14d225bd40f 100755
--- a/hack/jenkins/benchmark-dockerized.sh
+++ b/hack/jenkins/benchmark-dockerized.sh
@@ -33,7 +33,6 @@ retry() {
 
 export PATH=${GOPATH}/bin:${PWD}/third_party/etcd:/usr/local/go/bin:${PATH}
 
-retry go get github.com/tools/godep && godep version
 retry go get github.com/jstemmer/go-junit-report
 retry go get github.com/cespare/prettybench
 
diff --git a/hack/jenkins/test-dockerized.sh b/hack/jenkins/test-dockerized.sh
index f539cd8dfb2..0278435f1bf 100755
--- a/hack/jenkins/test-dockerized.sh
+++ b/hack/jenkins/test-dockerized.sh
@@ -33,7 +33,6 @@ retry() {
 
 export PATH=${GOPATH}/bin:${PWD}/third_party/etcd:/usr/local/go/bin:${PATH}
 
-retry go get github.com/tools/godep && godep version
 retry go get github.com/jstemmer/go-junit-report
 
 # Enable the Go race detector.
diff --git a/hack/jenkins/verify-dockerized.sh b/hack/jenkins/verify-dockerized.sh
index f18d6af64a8..c8d981bbec4 100755
--- a/hack/jenkins/verify-dockerized.sh
+++ b/hack/jenkins/verify-dockerized.sh
@@ -36,8 +36,6 @@ export KUBE_JUNIT_REPORT_DIR=${WORKSPACE}/artifacts
 # Set artifacts directory
 export ARTIFACTS_DIR=${WORKSPACE}/artifacts
 
-retry go get github.com/tools/godep && godep version
-
 export LOG_LEVEL=4
 
 cd /go/src/k8s.io/kubernetes
diff --git a/hack/jenkins/verify.sh b/hack/jenkins/verify.sh
index 073cffdec94..7393f6b4a78 100755
--- a/hack/jenkins/verify.sh
+++ b/hack/jenkins/verify.sh
@@ -32,6 +32,5 @@ export PATH=${GOPATH}/bin:${HOME}/third_party/etcd:/usr/local/go/bin:$PATH
 
 # Install a few things needed by the verification tests.
 command -v etcd &>/dev/null || ./hack/install-etcd.sh
-go get -u github.com/tools/godep
 
 make verify

From 78ed3891221b40b42f50e31a8ebd4f2aecb68db7 Mon Sep 17 00:00:00 2001
From: Christoph Blecker <admin@toph.ca>
Date: Tue, 30 Jan 2018 07:45:25 -0800
Subject: [PATCH 2/3] Remove unneeded code

---
 hack/godep-restore.sh |  1 -
 hack/verify-godeps.sh | 24 ------------------------
 2 files changed, 25 deletions(-)

diff --git a/hack/godep-restore.sh b/hack/godep-restore.sh
index aaee1b0ca3d..5da18d8f089 100755
--- a/hack/godep-restore.sh
+++ b/hack/godep-restore.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 "Restoring kubernetes godeps"
 
diff --git a/hack/verify-godeps.sh b/hack/verify-godeps.sh
index 91731ec8aaa..92f979ba159 100755
--- a/hack/verify-godeps.sh
+++ b/hack/verify-godeps.sh
@@ -18,30 +18,6 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-# As of go 1.6, the vendor experiment is enabled by default.
-export GO15VENDOREXPERIMENT=1
-
-#### HACK ####
-# Sometimes godep just can't handle things. This lets use manually put
-# some deps in place first, so godep won't fall over.
-preload-dep() {
-  org="$1"
-  project="$2"
-  sha="$3"
-  # project_dir ($4) is optional, if unset we will generate it
-  if [[ -z ${4:-} ]]; then
-    project_dir="${GOPATH}/src/${org}/${project}.git"
-  else
-    project_dir="${4}"
-  fi
-
-  echo "**HACK** preloading dep for ${org} ${project} at ${sha} into ${project_dir}"
-  git clone "https://${org}/${project}" "${project_dir}" > /dev/null 2>&1
-  pushd "${project_dir}" > /dev/null
-    git checkout "${sha}"
-  popd > /dev/null
-}
-
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
 source "${KUBE_ROOT}/hack/lib/init.sh"
 

From d58afe63845124afafce06739ff2638e51b29e15 Mon Sep 17 00:00:00 2001
From: Christoph Blecker <admin@toph.ca>
Date: Tue, 30 Jan 2018 09:30:36 -0800
Subject: [PATCH 3/3] When installing vendored godep, ensure that it's in path

---
 hack/lib/util.sh      | 3 +++
 hack/verify-godeps.sh | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/hack/lib/util.sh b/hack/lib/util.sh
index f699a295267..c4bfdbbca85 100755
--- a/hack/lib/util.sh
+++ b/hack/lib/util.sh
@@ -446,6 +446,9 @@ kube::util::ensure_godep_version() {
 
   kube::log::status "Installing godep version ${GODEP_VERSION}"
   go install ./vendor/github.com/tools/godep/
+  GP="$(echo $GOPATH | cut -f1 -d:)"
+  hash -r # force bash to clear PATH cache
+  PATH="${GP}/bin:${PATH}"
 
   if [[ "$(godep version 2>/dev/null)" != *"godep ${GODEP_VERSION}"* ]]; then
     kube::log::error "Expected godep ${GODEP_VERSION}, got $(godep version)"
diff --git a/hack/verify-godeps.sh b/hack/verify-godeps.sh
index 92f979ba159..8d91a20578a 100755
--- a/hack/verify-godeps.sh
+++ b/hack/verify-godeps.sh
@@ -29,6 +29,9 @@ if ! [[ ${KUBE_FORCE_VERIFY_CHECKS:-} =~ ^[yY]$ ]] && \
   exit 0
 fi
 
+# Ensure we have the right godep version available
+kube::util::ensure_godep_version
+
 if [[ -z ${TMP_GOPATH:-} ]]; then
   # Create a nice clean place to put our new godeps
   _tmpdir="$(mktemp -d -t gopath.XXXXXX)"