Skip to content

K
k3s
Unverified Commit b1aae873 authored by Christoph Blecker's avatar Christoph Blecker
Browse files
Options

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.
parent 6e5176b4
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
hack/lib/util.sh
View file @ b1aae873
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment