github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
pull/564/head
Christoph Blecker 2018-11-28 16:31:17 -08:00
parent 6e5176b48d
commit b1aae87327
No known key found for this signature in database
GPG Key ID: B34A59A9D39F838B
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hack/lib/util.sh
View File

@ -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