Skip to content

K
k3s
Commit b3ce311f authored by Zach Loafman's avatar Zach Loafman
Browse files
Options

Fix binary detection on GKE

* kubectl is kubectl.sh in the e2es, so not needed in the path * Use the environment variable, and try to make sure the preview component is installed.
parent 36cfc02c
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 10 deletions
cluster/gke/util.sh
View file @ b3ce311f
...@@ -69,16 +69,11 @@ function test-build-release() { ...@@ -69,16 +69,11 @@ function test-build-release() {
# Verify needed binaries exist. # Verify needed binaries exist.
function verify-prereqs() { function verify-prereqs() {
echo "... in verify-prereqs()" >&2 echo "... in verify-prereqs()" >&2
local cmd
# TODO(mbforbes): This assumes you have a "normal" gcloud installed even if ${GCLOUD} preview --help >/dev/null 2>&1 || {
# you are setting one differently using ${GCLOUD}. echo "Either the GCLOUD environment variable is wrong, or the 'preview' component"
for cmd in gcloud kubectl; do echo "is not installed. (Fix with 'gcloud components update preview')"
which "${cmd}" >/dev/null || { }
echo "Can't find ${cmd} in PATH, please fix and retry. The Google Cloud "
echo "SDK can be downloaded from https://cloud.google.com/sdk/."
exit 1
}
done
} }
# Instantiate a kubernetes cluster # Instantiate a kubernetes cluster
......
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