Skip to content

Commit ed5c7e6

Browse files
authored
Merge pull request kubernetes#76511 from liggitt/fixup-vendor-gopath
stop clearing GOPATH in vendor scripts
2 parents ae11829 + fb0cea2 commit ed5c7e6

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

hack/lint-dependencies.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
2323

2424
# Explicitly opt into go modules, even though we're inside a GOPATH directory
2525
export GO111MODULE=on
26-
# Explicitly clear GOPATH, to ensure nothing this script calls makes use of that path info
27-
export GOPATH=
2826
# Explicitly clear GOFLAGS, since GOFLAGS=-mod=vendor breaks dependency resolution while rebuilding vendor
2927
export GOFLAGS=
3028
# Detect problematic GOPROXY settings that prevent lookup of dependencies

hack/update-vendor.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
2323

2424
# Explicitly opt into go modules, even though we're inside a GOPATH directory
2525
export GO111MODULE=on
26-
# Explicitly clear GOPATH, to ensure nothing this script calls makes use of that path info
27-
export GOPATH=
2826
# Explicitly clear GOFLAGS, since GOFLAGS=-mod=vendor breaks dependency resolution while rebuilding vendor
2927
export GOFLAGS=
3028
# Ensure sort order doesn't depend on locale

hack/verify-vendor.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ mkdir -p "${_kubetmp}"
5050
git archive --format=tar --prefix=kubernetes/ "$(git write-tree)" | (cd "${_kubetmp}" && tar xf -)
5151
_kubetmp="${_kubetmp}/kubernetes"
5252

53-
# Do all our work with an unset GOPATH
54-
export GOPATH=
53+
# Do all our work in module mode
54+
export GO111MODULE=on
5555

5656
pushd "${_kubetmp}" > /dev/null 2>&1
5757
# Destroy deps in the copy of the kube tree

0 commit comments

Comments
 (0)