Correct gcloud list arg from '--zone' to '--zones'

bboreham · Fabio Yeon · commit e6e6c65ccc13 · 2016-10-31T13:07:28.000-07:00
`--zone` was accepted as an abbreviation but is now deprecated
and will be disabled entirely in gcloud 132.0.0.
diff --git 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
@@ -250,7 +250,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 \
