From f5159b49c20dea0a55d89ad822f3c1257fbd2bb9 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bryan@weave.works>
Date: Mon, 1 Aug 2016 11:44:13 +0100
Subject: [PATCH] Correct gcloud list arg from '--zone' to '--zones'

`--zone` was accepted as an abbreviation but is now deprecated
and will be disabled entirely in gcloud 132.0.0.
---
 cluster/gce/list-resources.sh | 6 +++---
 cluster/gce/upgrade.sh        | 2 +-
 cluster/gce/util.sh           | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cluster/gce/list-resources.sh b/cluster/gce/list-resources.sh
index 8e2204b03b4..2f57ed47384 100755
--- a/cluster/gce/list-resources.sh
+++ b/cluster/gce/list-resources.sh
@@ -74,11 +74,11 @@ echo "Provider: ${KUBERNETES_PROVIDER:-}"
 # List resources related to instances, filtering by the instance prefix if
 # provided.
 gcloud-compute-list instance-templates --regexp="${INSTANCE_PREFIX}.*"
-gcloud-compute-list instance-groups ${ZONE:+"--zone=${ZONE}"} --regexp="${INSTANCE_PREFIX}.*"
-gcloud-compute-list instances ${ZONE:+"--zone=${ZONE}"} --regexp="${INSTANCE_PREFIX}.*"
+gcloud-compute-list instance-groups ${ZONE:+"--zones=${ZONE}"} --regexp="${INSTANCE_PREFIX}.*"
+gcloud-compute-list instances ${ZONE:+"--zones=${ZONE}"} --regexp="${INSTANCE_PREFIX}.*"
 
 # List disk resources, filterying by instance prefix if provided.
-gcloud-compute-list disks ${ZONE:+"--zone=${ZONE}"} --regexp="${INSTANCE_PREFIX}.*"
+gcloud-compute-list disks ${ZONE:+"--zones=${ZONE}"} --regexp="${INSTANCE_PREFIX}.*"
 
 # List network resources. We include names starting with "a", corresponding to
 # those that Kubernetes creates.
diff --git a/cluster/gce/upgrade.sh b/cluster/gce/upgrade.sh
index 15ea372fd70..0fa202ad676 100755
--- a/cluster/gce/upgrade.sh
+++ b/cluster/gce/upgrade.sh
@@ -221,7 +221,7 @@ function do-node-upgrade() {
   for group in ${INSTANCE_GROUPS[@]}; do
     old_templates+=($(gcloud compute instance-groups managed list \
         --project="${PROJECT}" \
-        --zone="${ZONE}" \
+        --zones="${ZONE}" \
         --regexp="${group}" \
         --format='value(instanceTemplate)' || true))
     update=$(gcloud alpha compute rolling-updates \
diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
index 0ed91f56841..095aaadca71 100755
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -333,7 +333,7 @@ function detect-node-names {
   detect-project
   INSTANCE_GROUPS=()
   INSTANCE_GROUPS+=($(gcloud compute instance-groups managed list \
-    --zone "${ZONE}" --project "${PROJECT}" \
+    --zones "${ZONE}" --project "${PROJECT}" \
     --regexp "${NODE_INSTANCE_PREFIX}-.+" \
     --format='value(instanceGroup)' || true))
   NODE_NAMES=()
@@ -1163,7 +1163,7 @@ function kube-down {
   # Find out what minions are running.
   local -a minions
   minions=( $(gcloud compute instances list \
-                --project "${PROJECT}" --zone "${ZONE}" \
+                --project "${PROJECT}" --zones "${ZONE}" \
                 --regexp "${NODE_INSTANCE_PREFIX}-.+" \
                 --format='value(name)') )
   # If any minions are running, delete them in batches.
@@ -1275,7 +1275,7 @@ function check-resources {
   # Find out what minions are running.
   local -a minions
   minions=( $(gcloud compute instances list \
-                --project "${PROJECT}" --zone "${ZONE}" \
+                --project "${PROJECT}" --zones "${ZONE}" \
                 --regexp "${NODE_INSTANCE_PREFIX}-.+" \
                 --format='value(name)') )
   if (( "${#minions[@]}" > 0 )); then