Merge pull request #76511 from liggitt/fixup-vendor-gopath

stop clearing GOPATH in vendor scripts
kubernetes · Apr 13, 2019 · ed5c7e6 · ed5c7e6
2 parents ae11829 + fb0cea2
commit ed5c7e6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/hack/lint-dependencies.sh b/hack/lint-dependencies.sh
@@ -23,8 +23,6 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 
 # Explicitly opt into go modules, even though we're inside a GOPATH directory
 export GO111MODULE=on
-# Explicitly clear GOPATH, to ensure nothing this script calls makes use of that path info
-export GOPATH=
 # Explicitly clear GOFLAGS, since GOFLAGS=-mod=vendor breaks dependency resolution while rebuilding vendor
 export GOFLAGS=
 # Detect problematic GOPROXY settings that prevent lookup of dependencies

diff --git a/hack/update-vendor.sh b/hack/update-vendor.sh
@@ -23,8 +23,6 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 
 # Explicitly opt into go modules, even though we're inside a GOPATH directory
 export GO111MODULE=on
-# Explicitly clear GOPATH, to ensure nothing this script calls makes use of that path info
-export GOPATH=
 # Explicitly clear GOFLAGS, since GOFLAGS=-mod=vendor breaks dependency resolution while rebuilding vendor
 export GOFLAGS=
 # Ensure sort order doesn't depend on locale

diff --git a/hack/verify-vendor.sh b/hack/verify-vendor.sh
@@ -50,8 +50,8 @@ mkdir -p "${_kubetmp}"
 git archive --format=tar --prefix=kubernetes/ "$(git write-tree)" | (cd "${_kubetmp}" && tar xf -)
 _kubetmp="${_kubetmp}/kubernetes"
 
-# Do all our work with an unset GOPATH
-export GOPATH=
+# Do all our work in module mode
+export GO111MODULE=on
 
 pushd "${_kubetmp}" > /dev/null 2>&1
   # Destroy deps in the copy of the kube tree