Merge pull request #71538 from cblecker/godep-path

Don't use hermetic go environment for installing godep
This commit is contained in:
Kubernetes Prow Robot 2018-11-30 23:40:08 -08:00 committed by GitHub
commit 9b160ab90f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -456,10 +456,8 @@ kube::util::ensure_godep_version() {
# Otherwise, install forked godep # Otherwise, install forked godep
kube::log::status "Installing godep version ${godep_target_version}" kube::log::status "Installing godep version ${godep_target_version}"
# Run in hermetic GOPATH GOBIN="${KUBE_OUTPUT_BINPATH}" go install k8s.io/kubernetes/third_party/forked/godep
kube::golang::setup_env export KUBE_GODEP="${KUBE_OUTPUT_BINPATH}/godep"
go install k8s.io/kubernetes/third_party/forked/godep
export KUBE_GODEP="${KUBE_GOPATH}/bin/godep"
kube::log::status "Installed ${KUBE_GODEP}" kube::log::status "Installed ${KUBE_GODEP}"
# Verify that the installed godep from fork is what we expect # Verify that the installed godep from fork is what we expect