github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename KUBE_OUTPUT_BINPATH -> KUBE_OUTPUT_BIN

Browse Source 
"...PATH" doesn't add anything and confuses it with KUBE_OUTPUT_SUBPATH.
This commit is contained in:
Tim Hockin
2022-05-21 13:11:12 -07:00
parent aaf6fc07d8
commit f47e0cb779
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hack/lib/golang.sh
View File

@@ -691,10 +691,10 @@ kube::golang::setup_gomaxprocs() {
} }
# This will take binaries from $GOPATH/bin and copy them to the appropriate # 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 # 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 # install' will place binaries that match the host platform directly in $GOBIN
# while placing cross compiled binaries into `platform_arch` subdirs. This # while placing cross compiled binaries into `platform_arch` subdirs. This
# complicates pretty much everything else we do around packaging and such. # complicates pretty much everything else we do around packaging and such.
@@ -712,14 +712,14 @@ kube::golang::place_bins() {
if [[ "${platform}" == "${host_platform}" ]]; then if [[ "${platform}" == "${host_platform}" ]]; then
platform_src="" platform_src=""
rm -f "${THIS_PLATFORM_BIN}" rm -f "${THIS_PLATFORM_BIN}"
ln -s "${KUBE_OUTPUT_BINPATH}/${platform}" "${THIS_PLATFORM_BIN}" ln -s "${KUBE_OUTPUT_BIN}/${platform}" "${THIS_PLATFORM_BIN}"
fi fi
local full_binpath_src="${KUBE_GOPATH}/bin${platform_src}" local full_binpath_src="${KUBE_GOPATH}/bin${platform_src}"
if [[ -d "${full_binpath_src}" ]]; then 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 \ find "${full_binpath_src}" -maxdepth 1 -type f -exec \
rsync -pc {} "${KUBE_OUTPUT_BINPATH}/${platform}" \; rsync -pc {} "${KUBE_OUTPUT_BIN}/${platform}" \;
fi fi
done done
} }

4
hack/lib/init.sh
View File

@@ -43,7 +43,7 @@ KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
KUBE_OUTPUT_SUBPATH="${KUBE_OUTPUT_SUBPATH:-_output/local}" KUBE_OUTPUT_SUBPATH="${KUBE_OUTPUT_SUBPATH:-_output/local}"
KUBE_OUTPUT="${KUBE_ROOT}/${KUBE_OUTPUT_SUBPATH}" 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 # This controls rsync compression. Set to a value > 0 to enable rsync
# compression for build container # 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/golang.sh"
source "${KUBE_ROOT}/hack/lib/etcd.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 export KUBE_OUTPUT_HOSTBIN
# list of all available group versions. This should be used when generated code # list of all available group versions. This should be used when generated code

2
hack/update-netparse-cve.sh
View File

@@ -31,7 +31,7 @@ source "${KUBE_ROOT}/hack/lib/util.sh"
kube::golang::verify_go_version kube::golang::verify_go_version
# Ensure that we find the binaries we build before anything else. # Ensure that we find the binaries we build before anything else.
export GOBIN="${KUBE_OUTPUT_BINPATH}" export GOBIN="${KUBE_OUTPUT_BIN}"
PATH="${GOBIN}:${PATH}" PATH="${GOBIN}:${PATH}"
# Explicitly opt into go modules, even though we're inside a GOPATH directory # Explicitly opt into go modules, even though we're inside a GOPATH directory

2
hack/verify-external-dependencies-version.sh
View File

@@ -27,7 +27,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::verify_go_version kube::golang::verify_go_version
# Ensure that we find the binaries we build before anything else. # Ensure that we find the binaries we build before anything else.
export GOBIN="${KUBE_OUTPUT_BINPATH}" export GOBIN="${KUBE_OUTPUT_BIN}"
PATH="${GOBIN}:${PATH}" PATH="${GOBIN}:${PATH}"
# Install zeitgeist # Install zeitgeist

2
hack/verify-golangci-lint.sh
View File

@@ -45,7 +45,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
source "${KUBE_ROOT}/hack/lib/util.sh" source "${KUBE_ROOT}/hack/lib/util.sh"
# Ensure that we find the binaries we build before anything else. # Ensure that we find the binaries we build before anything else.
export GOBIN="${KUBE_OUTPUT_BINPATH}" export GOBIN="${KUBE_OUTPUT_BIN}"
PATH="${GOBIN}:${PATH}" PATH="${GOBIN}:${PATH}"
invocation=(./hack/verify-golangci-lint.sh "$@") invocation=(./hack/verify-golangci-lint.sh "$@")

2
hack/verify-licenses.sh
View File

@@ -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 cd "${KUBE_TEMP}"/tmp_test_licenses/kubernetes && rm -rf vendor
# Ensure that we find the binaries we build before anything else. # Ensure that we find the binaries we build before anything else.
export GOBIN="${KUBE_OUTPUT_BINPATH}" export GOBIN="${KUBE_OUTPUT_BIN}"
PATH="${GOBIN}:${PATH}" PATH="${GOBIN}:${PATH}"
# Explicitly opt into go modules, even though we're inside a GOPATH directory # Explicitly opt into go modules, even though we're inside a GOPATH directory

2
hack/verify-spelling.sh
View File

@@ -26,7 +26,7 @@ export KUBE_ROOT
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
# Ensure that we find the binaries we build before anything else. # Ensure that we find the binaries we build before anything else.
export GOBIN="${KUBE_OUTPUT_BINPATH}" export GOBIN="${KUBE_OUTPUT_BIN}"
PATH="${GOBIN}:${PATH}" PATH="${GOBIN}:${PATH}"
# Install tools we need # Install tools we need