From d785f13c0595c77084fd10b4c21cddccdeba0add Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Sat, 9 Dec 2023 16:12:45 -0800 Subject: [PATCH] Change verify-licenses to new setup_env --- hack/verify-licenses.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hack/verify-licenses.sh b/hack/verify-licenses.sh index 73fcc37a100..624b03ef8b0 100755 --- a/hack/verify-licenses.sh +++ b/hack/verify-licenses.sh @@ -27,7 +27,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/util.sh" # This sets up the environment, like GOCACHE, which keeps the worktree cleaner. -kube::golang::old::setup_env +kube::golang::new::setup_env kube::util::ensure-temp-dir ARTIFACTS="${ARTIFACTS:-${PWD}/_artifacts}" @@ -42,9 +42,6 @@ cd "${KUBE_TEMP}"/tmp_test_licenses/kubernetes && rm -rf vendor export GOBIN="${KUBE_OUTPUT_BIN}" PATH="${GOBIN}:${PATH}" -# Explicitly opt into go modules, even though we're inside a GOPATH directory -export GO111MODULE=on - function http_code() { curl -I -s -o /dev/null -w "%{http_code}" "$1" }