diff --git a/Makefile b/Makefile index 546d311db211..e01d80c923a5 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ endif # Binaries. # # Note: Need to use abspath so we can invoke these from subdirectories -KUSTOMIZE_VER := v4.4.1 +KUSTOMIZE_VER := v4.5.2 KUSTOMIZE_BIN := kustomize KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER)) KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v4 diff --git a/scripts/go_install.sh b/scripts/go_install.sh index 9607125257ad..415e06d8017e 100755 --- a/scripts/go_install.sh +++ b/scripts/go_install.sh @@ -37,20 +37,9 @@ if [ -z "${GOBIN}" ]; then exit 1 fi -tmp_dir=$(mktemp -d -t goinstall_XXXXXXXXXX) -function clean { - rm -rf "${tmp_dir}" -} -trap clean EXIT - rm "${GOBIN}/${2}"* || true -cd "${tmp_dir}" - -# create a new module in the tmp directory -go mod init fake/mod - # install the golang module specified as the first argument -go get -tags tools "${1}@${3}" +go install -tags tools "${1}@${3}" mv "${GOBIN}/${2}" "${GOBIN}/${2}-${3}" ln -sf "${GOBIN}/${2}-${3}" "${GOBIN}/${2}"