From 651297220ef3b38ddcd3cbabbeef99adaf691a18 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Thu, 4 Jan 2024 14:59:12 -0800 Subject: [PATCH] Fix pin-dependency for workspaces --- hack/pin-dependency.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hack/pin-dependency.sh b/hack/pin-dependency.sh index dc6c1c5cb91..0ea148aab49 100755 --- a/hack/pin-dependency.sh +++ b/hack/pin-dependency.sh @@ -25,9 +25,12 @@ set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" -# Explicitly opt into go modules -export GO111MODULE=on +kube::golang::setup_env +kube::golang::verify_go_version +kube::util::require-jq + # Explicitly set GOFLAGS to ignore vendor, since GOFLAGS=-mod=vendor breaks dependency resolution while rebuilding vendor +export GOWORK=off export GOFLAGS=-mod=mod # Detect problematic GOPROXY settings that prevent lookup of dependencies if [[ "${GOPROXY:-}" == "off" ]]; then @@ -35,9 +38,6 @@ if [[ "${GOPROXY:-}" == "off" ]]; then exit 1 fi -kube::golang::verify_go_version -kube::util::require-jq - dep="${1:-}" sha="${2:-}"