diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 5a90a7d0c34..11bea167715 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -247,8 +247,8 @@ function upload-server-tars() { # MINION_NAMES function detect-minion-names { detect-project - MINION_NAMES=($(gcloud preview --project "${PROJECT}" instance-groups \ - --zone "${ZONE}" instances --group "${NODE_INSTANCE_PREFIX}-group" list \ + MINION_NAMES=($(gcloud compute instance-groups managed list-instances \ + "${NODE_INSTANCE_PREFIX}-group" --zone "${ZONE}" --project "${PROJECT}" \ | cut -d'/' -f11)) echo "MINION_NAMES=${MINION_NAMES[*]}" >&2 } @@ -764,7 +764,7 @@ function kube-down { # The gcloud APIs don't return machine parseable error codes/retry information. Therefore the best we can # do is parse the output and special case particular responses we are interested in. - if gcloud compute instance-groups managed describe --project "${PROJECT}" --zone "${ZONE}" "${NODE_INSTANCE_PREFIX}-group" &>/dev/null; then + if gcloud compute instance-groups managed describe "${NODE_INSTANCE_PREFIX}-group" --project "${PROJECT}" --zone "${ZONE}" &>/dev/null; then deleteCmdOutput=$(gcloud compute instance-groups managed delete --zone "${ZONE}" \ --project "${PROJECT}" \ --quiet \ diff --git a/cluster/gke/util.sh b/cluster/gke/util.sh index 6d4ea3a477d..ea15e7a279f 100755 --- a/cluster/gke/util.sh +++ b/cluster/gke/util.sh @@ -243,9 +243,10 @@ function detect-minions() { function detect-minion-names { detect-project detect-node-instance-group - MINION_NAMES=($(gcloud preview --project "${PROJECT}" instance-groups \ - --zone "${ZONE}" instances --group "${NODE_INSTANCE_GROUP}" list \ - | cut -d'/' -f11)) + MINION_NAMES=($(gcloud compute instance-groups managed list-instances \ + "${NODE_INSTANCE_GROUP}" --zone "${ZONE}" --project "${PROJECT}" \ + --format=yaml | grep instance: | cut -d ' ' -f 2)) + echo "MINION_NAMES=${MINION_NAMES[*]}" }