github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #107386 from ZeusPerez/fix-kubetest-errors-when-executing-local-provider

Browse Source 
Fix kubetest errors when executing local provider
This commit is contained in:
Kubernetes Prow Robot 2022-01-31 19:56:17 -08:00 committed by GitHub
commit 6dd234d85c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/kubectl.sh
View File

@ -33,6 +33,7 @@ set -o pipefail
KUBE_ROOT=${KUBE_ROOT:-$(dirname "${BASH_SOURCE[0]}")/..}
source "${KUBE_ROOT}/cluster/kube-util.sh"
source "${KUBE_ROOT}/hack/lib/util.sh"
source "${KUBE_ROOT}/hack/lib/logging.sh"
# If KUBECTL_PATH isn't set, gather up the list of likely places and use ls
# to find the latest one.

7
hack/lib/util.sh
View File

@ -211,6 +211,7 @@ kube::util::find-binary-for-platform() {
"${KUBE_ROOT}/_output/local/bin/${platform}/${lookfor}"
"${KUBE_ROOT}/platforms/${platform}/${lookfor}"
)
# if we're looking for the host platform, add local non-platform-qualified search paths
if [[ "${platform}" = "$(kube::util::host_platform)" ]]; then
locations+=(
@ -219,6 +220,12 @@ kube::util::find-binary-for-platform() {
);
fi
# looks for $1 in the $PATH
if which "${lookfor}" >/dev/null; then
local -r local_bin="$(which "${lookfor}")"
locations+=( "${local_bin}" );
fi
# List most recently-updated location.
local -r bin=$( (ls -t "${locations[@]}" 2>/dev/null || true) | head -1 )