diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh index 4aefbde873d..9fbb4bcab56 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh @@ -691,10 +691,10 @@ kube::golang::setup_gomaxprocs() { } # This will take binaries from $GOPATH/bin and copy them to the appropriate -# place in ${KUBE_OUTPUT_BINDIR} +# place in ${KUBE_OUTPUT_BIN} # # Ideally this wouldn't be necessary and we could just set GOBIN to -# KUBE_OUTPUT_BINDIR but that won't work in the face of cross compilation. 'go +# KUBE_OUTPUT_BIN but that won't work in the face of cross compilation. 'go # install' will place binaries that match the host platform directly in $GOBIN # while placing cross compiled binaries into `platform_arch` subdirs. This # complicates pretty much everything else we do around packaging and such. @@ -712,14 +712,14 @@ kube::golang::place_bins() { if [[ "${platform}" == "${host_platform}" ]]; then platform_src="" rm -f "${THIS_PLATFORM_BIN}" - ln -s "${KUBE_OUTPUT_BINPATH}/${platform}" "${THIS_PLATFORM_BIN}" + ln -s "${KUBE_OUTPUT_BIN}/${platform}" "${THIS_PLATFORM_BIN}" fi local full_binpath_src="${KUBE_GOPATH}/bin${platform_src}" if [[ -d "${full_binpath_src}" ]]; then - mkdir -p "${KUBE_OUTPUT_BINPATH}/${platform}" + mkdir -p "${KUBE_OUTPUT_BIN}/${platform}" find "${full_binpath_src}" -maxdepth 1 -type f -exec \ - rsync -pc {} "${KUBE_OUTPUT_BINPATH}/${platform}" \; + rsync -pc {} "${KUBE_OUTPUT_BIN}/${platform}" \; fi done } diff --git a/hack/lib/init.sh b/hack/lib/init.sh index 9ff4f01366c..7f5f4f0e108 100755 --- a/hack/lib/init.sh +++ b/hack/lib/init.sh @@ -43,7 +43,7 @@ KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)" KUBE_OUTPUT_SUBPATH="${KUBE_OUTPUT_SUBPATH:-_output/local}" KUBE_OUTPUT="${KUBE_ROOT}/${KUBE_OUTPUT_SUBPATH}" -KUBE_OUTPUT_BINPATH="${KUBE_OUTPUT}/bin" +KUBE_OUTPUT_BIN="${KUBE_OUTPUT}/bin" # This controls rsync compression. Set to a value > 0 to enable rsync # compression for build container @@ -66,7 +66,7 @@ source "${KUBE_ROOT}/hack/lib/version.sh" source "${KUBE_ROOT}/hack/lib/golang.sh" source "${KUBE_ROOT}/hack/lib/etcd.sh" -KUBE_OUTPUT_HOSTBIN="${KUBE_OUTPUT_BINPATH}/$(kube::util::host_platform)" +KUBE_OUTPUT_HOSTBIN="${KUBE_OUTPUT_BIN}/$(kube::util::host_platform)" export KUBE_OUTPUT_HOSTBIN # list of all available group versions. This should be used when generated code diff --git a/hack/update-netparse-cve.sh b/hack/update-netparse-cve.sh index f972af10894..e661a842da9 100755 --- a/hack/update-netparse-cve.sh +++ b/hack/update-netparse-cve.sh @@ -31,7 +31,7 @@ source "${KUBE_ROOT}/hack/lib/util.sh" kube::golang::verify_go_version # Ensure that we find the binaries we build before anything else. -export GOBIN="${KUBE_OUTPUT_BINPATH}" +export GOBIN="${KUBE_OUTPUT_BIN}" PATH="${GOBIN}:${PATH}" # Explicitly opt into go modules, even though we're inside a GOPATH directory diff --git a/hack/verify-external-dependencies-version.sh b/hack/verify-external-dependencies-version.sh index 54c861bf5d6..c84ba8653ea 100755 --- a/hack/verify-external-dependencies-version.sh +++ b/hack/verify-external-dependencies-version.sh @@ -27,7 +27,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh" kube::golang::verify_go_version # Ensure that we find the binaries we build before anything else. -export GOBIN="${KUBE_OUTPUT_BINPATH}" +export GOBIN="${KUBE_OUTPUT_BIN}" PATH="${GOBIN}:${PATH}" # Install zeitgeist diff --git a/hack/verify-golangci-lint.sh b/hack/verify-golangci-lint.sh index 96a40915461..a644c6515c3 100755 --- a/hack/verify-golangci-lint.sh +++ b/hack/verify-golangci-lint.sh @@ -45,7 +45,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/util.sh" # Ensure that we find the binaries we build before anything else. -export GOBIN="${KUBE_OUTPUT_BINPATH}" +export GOBIN="${KUBE_OUTPUT_BIN}" PATH="${GOBIN}:${PATH}" invocation=(./hack/verify-golangci-lint.sh "$@") diff --git a/hack/verify-licenses.sh b/hack/verify-licenses.sh index 67800fb5e75..73fcc37a100 100755 --- a/hack/verify-licenses.sh +++ b/hack/verify-licenses.sh @@ -39,7 +39,7 @@ git worktree add -f "${KUBE_TEMP}"/tmp_test_licenses/kubernetes HEAD >/dev/null cd "${KUBE_TEMP}"/tmp_test_licenses/kubernetes && rm -rf vendor # Ensure that we find the binaries we build before anything else. -export GOBIN="${KUBE_OUTPUT_BINPATH}" +export GOBIN="${KUBE_OUTPUT_BIN}" PATH="${GOBIN}:${PATH}" # Explicitly opt into go modules, even though we're inside a GOPATH directory diff --git a/hack/verify-spelling.sh b/hack/verify-spelling.sh index d3c9e9347d3..3064f38ebb9 100755 --- a/hack/verify-spelling.sh +++ b/hack/verify-spelling.sh @@ -26,7 +26,7 @@ export KUBE_ROOT source "${KUBE_ROOT}/hack/lib/init.sh" # Ensure that we find the binaries we build before anything else. -export GOBIN="${KUBE_OUTPUT_BINPATH}" +export GOBIN="${KUBE_OUTPUT_BIN}" PATH="${GOBIN}:${PATH}" # Install tools we need