File tree Expand file tree Collapse file tree 3 files changed +2
-6
lines changed Expand file tree Collapse file tree 3 files changed +2
-6
lines changed Original file line number Diff line number Diff line change @@ -23,8 +23,6 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
23
23
24
24
# Explicitly opt into go modules, even though we're inside a GOPATH directory
25
25
export GO111MODULE=on
26
- # Explicitly clear GOPATH, to ensure nothing this script calls makes use of that path info
27
- export GOPATH=
28
26
# Explicitly clear GOFLAGS, since GOFLAGS=-mod=vendor breaks dependency resolution while rebuilding vendor
29
27
export GOFLAGS=
30
28
# Detect problematic GOPROXY settings that prevent lookup of dependencies
Original file line number Diff line number Diff line change @@ -23,8 +23,6 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
23
23
24
24
# Explicitly opt into go modules, even though we're inside a GOPATH directory
25
25
export GO111MODULE=on
26
- # Explicitly clear GOPATH, to ensure nothing this script calls makes use of that path info
27
- export GOPATH=
28
26
# Explicitly clear GOFLAGS, since GOFLAGS=-mod=vendor breaks dependency resolution while rebuilding vendor
29
27
export GOFLAGS=
30
28
# Ensure sort order doesn't depend on locale
Original file line number Diff line number Diff line change @@ -50,8 +50,8 @@ mkdir -p "${_kubetmp}"
50
50
git archive --format=tar --prefix=kubernetes/ " $( git write-tree) " | (cd " ${_kubetmp} " && tar xf -)
51
51
_kubetmp=" ${_kubetmp} /kubernetes"
52
52
53
- # Do all our work with an unset GOPATH
54
- export GOPATH=
53
+ # Do all our work in module mode
54
+ export GO111MODULE=on
55
55
56
56
pushd " ${_kubetmp} " > /dev/null 2>&1
57
57
# Destroy deps in the copy of the kube tree
You can’t perform that action at this time.
0 commit comments