From b1aae873274d5ac51bc2d5df4eacdf333fc8efd4 Mon Sep 17 00:00:00 2001 From: Christoph Blecker Date: Wed, 28 Nov 2018 16:31:17 -0800 Subject: [PATCH] Don't use hermetic go environment for installing godep This is unneeded, and causes this build environment to persist throughout the lifetime of any godep script. --- hack/lib/util.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hack/lib/util.sh b/hack/lib/util.sh index ccecdcfa88..68b5c6bd65 100755 --- a/hack/lib/util.sh +++ b/hack/lib/util.sh @@ -456,10 +456,8 @@ kube::util::ensure_godep_version() { # Otherwise, install forked godep kube::log::status "Installing godep version ${godep_target_version}" - # Run in hermetic GOPATH - kube::golang::setup_env - go install k8s.io/kubernetes/third_party/forked/godep - export KUBE_GODEP="${KUBE_GOPATH}/bin/godep" + GOBIN="${KUBE_OUTPUT_BINPATH}" go install k8s.io/kubernetes/third_party/forked/godep + export KUBE_GODEP="${KUBE_OUTPUT_BINPATH}/godep" kube::log::status "Installed ${KUBE_GODEP}" # Verify that the installed godep from fork is what we expect