Skip to content

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

Merge pull request #18377 from roberthbailey/gcloud-prompts

Use gcloud install instead of gcloud update for components to remove the annoying prompt
parents e264db43 48a84bae
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
cluster/gce/util.sh
View file @ f1f250c6
...@@ -79,8 +79,8 @@ function verify-prereqs { ...@@ -79,8 +79,8 @@ function verify-prereqs {
if [ ! -w $(dirname `which gcloud`) ]; then if [ ! -w $(dirname `which gcloud`) ]; then
sudo_prefix="sudo" sudo_prefix="sudo"
fi fi
${sudo_prefix} gcloud ${gcloud_prompt:-} components update alpha || true ${sudo_prefix} gcloud ${gcloud_prompt:-} components install alpha || true
${sudo_prefix} gcloud ${gcloud_prompt:-} components update beta || true ${sudo_prefix} gcloud ${gcloud_prompt:-} components install beta || true
${sudo_prefix} gcloud ${gcloud_prompt:-} components update || true ${sudo_prefix} gcloud ${gcloud_prompt:-} components update || true
} }
......
cluster/gke/util.sh
View file @ f1f250c6
...@@ -98,10 +98,9 @@ function verify-prereqs() { ...@@ -98,10 +98,9 @@ function verify-prereqs() {
if [ ! -w $(dirname `which gcloud`) ]; then if [ ! -w $(dirname `which gcloud`) ]; then
sudo_prefix="sudo" sudo_prefix="sudo"
fi fi
${sudo_prefix} gcloud ${gcloud_prompt:-} components update alpha || true ${sudo_prefix} gcloud ${gcloud_prompt:-} components install alpha || true
${sudo_prefix} gcloud ${gcloud_prompt:-} components update beta || true ${sudo_prefix} gcloud ${gcloud_prompt:-} components install beta || true
${sudo_prefix} gcloud ${gcloud_prompt:-} components update ${CMD_GROUP:-} || true ${sudo_prefix} gcloud ${gcloud_prompt:-} components install kubectl|| true
${sudo_prefix} gcloud ${gcloud_prompt:-} components update kubectl|| true
${sudo_prefix} gcloud ${gcloud_prompt:-} components update || true ${sudo_prefix} gcloud ${gcloud_prompt:-} components update || true
} }
......
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