github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Update helper scripts to find binaries in new bazel-bin paths

Browse Source
This commit is contained in:
Jeff Grafton 2017-12-16 11:57:17 -08:00
parent a532ecd704
commit 924fd3b058
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/clientbin.sh
View File

@ -84,9 +84,14 @@ function get_bin() {
"${KUBE_ROOT}/_output/bin/${bin}" "${KUBE_ROOT}/_output/bin/${bin}"
"${KUBE_ROOT}/_output/dockerized/bin/${host_os}/${host_arch}/${bin}" "${KUBE_ROOT}/_output/dockerized/bin/${host_os}/${host_arch}/${bin}"
"${KUBE_ROOT}/_output/local/bin/${host_os}/${host_arch}/${bin}" "${KUBE_ROOT}/_output/local/bin/${host_os}/${host_arch}/${bin}"
"${KUBE_ROOT}/bazel-bin/${srcdir}/${bin}"
"${KUBE_ROOT}/platforms/${host_os}/${host_arch}/${bin}" "${KUBE_ROOT}/platforms/${host_os}/${host_arch}/${bin}"
) )
# Also search for binary in bazel build tree.
# The bazel go rules place binaries in subtrees like
# "bazel-bin/source/path/linux_amd64_pure_stripped/binaryname", so make sure
# the platform name is matched in the path.
locations+=($(find "${KUBE_ROOT}/bazel-bin/${srcdir}" -type f -executable \
-path "*/${host_os}_${host_arch}*/${bin}" 2>/dev/null || true) )
echo $( (ls -t "${locations[@]}" 2>/dev/null || true) | head -1 ) echo $( (ls -t "${locations[@]}" 2>/dev/null || true) | head -1 )
} }

7
hack/lib/util.sh
View File

@ -148,10 +148,11 @@ kube::util::find-binary-for-platform() {
"${KUBE_ROOT}/platforms/${platform}/${lookfor}" "${KUBE_ROOT}/platforms/${platform}/${lookfor}"
) )
# Also search for binary in bazel build tree. # Also search for binary in bazel build tree.
# In some cases we have to name the binary $BINARY_bin, since there was a # The bazel go rules place binaries in subtrees like
# directory named $BINARY next to it. # "bazel-bin/source/path/linux_amd64_pure_stripped/binaryname", so make sure
# the platform name is matched in the path.
locations+=($(find "${KUBE_ROOT}/bazel-bin/" -type f -executable \ locations+=($(find "${KUBE_ROOT}/bazel-bin/" -type f -executable \
\( -name "${lookfor}" -o -name "${lookfor}_bin" \) 2>/dev/null || true) ) -path "*/${platform/\//_}*/${lookfor}" 2>/dev/null || true) )
# List most recently-updated location. # List most recently-updated location.
local -r bin=$( (ls -t "${locations[@]}" 2>/dev/null || true) | head -1 ) local -r bin=$( (ls -t "${locations[@]}" 2>/dev/null || true) | head -1 )