Skip to content

K
k3s
Commit 7bfe57b3 authored by Dawn Chen's avatar Dawn Chen
Browse files
Options

Merge pull request #6783 from eparis/use-hack-lib-find-binaries

Use a helper to find built binaries
parents 8420abee 6d4ab258
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 86 deletions
cluster/kubectl.sh
View file @ 7bfe57b3
...@@ -20,6 +20,7 @@ set -o pipefail ...@@ -20,6 +20,7 @@ set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/cluster/kube-env.sh" source "${KUBE_ROOT}/cluster/kube-env.sh"
source "${KUBE_ROOT}/hack/lib/util.sh"
UTILS=${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh UTILS=${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh
if [ -f ${UTILS} ]; then if [ -f ${UTILS} ]; then
source "${UTILS}" source "${UTILS}"
...@@ -31,51 +32,10 @@ get_absolute_dirname() { ...@@ -31,51 +32,10 @@ get_absolute_dirname() {
echo "$(cd "$(dirname "$1")" && pwd)" echo "$(cd "$(dirname "$1")" && pwd)"
} }
# Detect the OS name/arch so that we can find our binary
case "$(uname -s)" in
Darwin)
host_os=darwin
;;
Linux)
host_os=linux
;;
*)
echo "Unsupported host OS. Must be Linux or Mac OS X." >&2
exit 1
;;
esac
case "$(uname -m)" in
x86_64*)
host_arch=amd64
;;
i?86_64*)
host_arch=amd64
;;
amd64*)
host_arch=amd64
;;
arm*)
host_arch=arm
;;
i?86*)
host_arch=x86
;;
*)
echo "Unsupported host arch. Must be x86_64, 386 or arm." >&2
exit 1
;;
esac
# If KUBECTL_PATH isn't set, gather up the list of likely places and use ls # If KUBECTL_PATH isn't set, gather up the list of likely places and use ls
# to find the latest one. # to find the latest one.
if [[ -z "${KUBECTL_PATH:-}" ]]; then if [[ -z "${KUBECTL_PATH:-}" ]]; then
locations=( kubectl=$(kube::util::find-binary "kubectl")
"${KUBE_ROOT}/_output/dockerized/bin/${host_os}/${host_arch}/kubectl"
"${KUBE_ROOT}/_output/local/bin/${host_os}/${host_arch}/kubectl"
"${KUBE_ROOT}/platforms/${host_os}/${host_arch}/kubectl"
)
kubectl=$( (ls -t "${locations[@]}" 2>/dev/null || true) | head -1 )
if [[ ! -x "$kubectl" ]]; then if [[ ! -x "$kubectl" ]]; then
{ {
......
hack/ginkgo-e2e.sh
View file @ 7bfe57b3
...@@ -21,50 +21,8 @@ set -o pipefail ...@@ -21,50 +21,8 @@ set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
# --- Find local test binaries. # --- Find local test binaries.
source "${KUBE_ROOT}/hack/lib/util.sh"
# Detect the OS name/arch so that we can find our binary e2e=$(kube::util::find-binary "e2e")
case "$(uname -s)" in
Darwin)
host_os=darwin
;;
Linux)
host_os=linux
;;
*)
echo "Unsupported host OS. Must be Linux or Mac OS X." >&2
exit 1
;;
esac
case "$(uname -m)" in
x86_64*)
host_arch=amd64
;;
i?86_64*)
host_arch=amd64
;;
amd64*)
host_arch=amd64
;;
arm*)
host_arch=arm
;;
i?86*)
host_arch=x86
;;
*)
echo "Unsupported host arch. Must be x86_64, 386 or arm." >&2
exit 1
;;
esac
# Gather up the list of likely places and use ls to find the latest one.
locations=(
"${KUBE_ROOT}/_output/dockerized/bin/${host_os}/${host_arch}/e2e"
"${KUBE_ROOT}/_output/local/bin/${host_os}/${host_arch}/e2e"
"${KUBE_ROOT}/platforms/${host_os}/${host_arch}/e2e"
)
e2e=$( (ls -t "${locations[@]}" 2>/dev/null || true) | head -1 )
# --- Setup some env vars. # --- Setup some env vars.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment