diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 6a3811dbd0a..7b3695bed90 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -25,6 +25,7 @@ source "${KUBE_ROOT}/cluster/common.sh" NODE_INSTANCE_PREFIX="${INSTANCE_PREFIX}-minion" KUBE_PROMPT_FOR_UPDATE=y +KUBE_SKIP_UPDATE=${KUBE_SKIP_UPDATE-"n"} # Verify prereqs function verify-prereqs { @@ -48,12 +49,19 @@ function verify-prereqs { fi fi done + if [[ "${KUBE_SKIP_UPDATE} == "y" ]]; then + return + fi # update and install components as needed if [[ "${KUBE_PROMPT_FOR_UPDATE}" != "y" ]]; then gcloud_prompt="-q" fi - gcloud ${gcloud_prompt:-} components update preview || true - gcloud ${gcloud_prompt:-} components update || true + if [ ! -w $(dirname `which gcloud`) ]; then + sudo_prefix="sudo" + fi + ${sudo_prefix} gcloud ${gcloud_prompt:-} components update preview || true + ${sudo_prefix} gcloud ${gcloud_prompt:-} components update alpha || true + ${sudo_prefix} gcloud ${gcloud_prompt:-} components update || true } # Create a temp dir that'll be deleted at the end of this bash session. diff --git a/cluster/gke/util.sh b/cluster/gke/util.sh index f8422386ca8..a57bfbaada2 100755 --- a/cluster/gke/util.sh +++ b/cluster/gke/util.sh @@ -20,6 +20,7 @@ # config-default.sh. KUBE_PROMPT_FOR_UPDATE=y +KUBE_SKIP_UPDATE=${KUBE_SKIP_UPDATE-"n"} KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. source "${KUBE_ROOT}/cluster/gke/${KUBE_CONFIG_FILE:-config-default.sh}" @@ -86,13 +87,19 @@ function verify-prereqs() { exit 1 fi fi + if [[ "${KUBE_SKIP_UPDATE} == "y" ]]; then + return + fi # update and install components as needed if [[ "${KUBE_PROMPT_FOR_UPDATE}" != "y" ]]; then gcloud_prompt="-q" fi - gcloud ${gcloud_prompt:-} components update preview || true - gcloud ${gcloud_prompt:-} components update alpha || true - gcloud ${gcloud_prompt:-} components update || true + if [ ! -w $(dirname `which gcloud`) ]; then + sudo_prefix="sudo" + fi + ${sudo_prefix} gcloud ${gcloud_prompt:-} components update preview || true + ${sudo_prefix} gcloud ${gcloud_prompt:-} components update alpha|| true + ${sudo_prefix} gcloud ${gcloud_prompt:-} components update || true } # Instantiate a kubernetes cluster