From 2257f46caca9592a0d4cf70ed8debf421c659f9e Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Sat, 25 Jul 2020 15:32:26 -0400 Subject: [PATCH] [go1.15] fix pin-dependency.sh to only use module info --- hack/pin-dependency.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/pin-dependency.sh b/hack/pin-dependency.sh index 96150a7841d..fd6ef8eee12 100755 --- a/hack/pin-dependency.sh +++ b/hack/pin-dependency.sh @@ -27,8 +27,8 @@ 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 GOFLAGS, since GOFLAGS=-mod=vendor breaks dependency resolution while rebuilding vendor -export GOFLAGS= +# Explicitly set GOFLAGS to ignore vendor, since GOFLAGS=-mod=vendor breaks dependency resolution while rebuilding vendor +export GOFLAGS=-mod=mod # Detect problematic GOPROXY settings that prevent lookup of dependencies if [[ "${GOPROXY:-}" == "off" ]]; then kube::log::error "Cannot run with \$GOPROXY=off"