Merge branch 'release-1.2' into automated-cherry-pick-of-kubernetes#2…

…5405-upstream-release-1.2
shouhong · Jun 6, 2016 · 9eb4cdb · 9eb4cdb
2 parents 6889c64 + 124a585
commit 9eb4cdb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
@@ -30,7 +30,8 @@ elif [[ "${OS_DISTRIBUTION}" == "gci" ]]; then
   # If the master or node image is not set, we use the latest GCI dev image.
   # Otherwise, we respect whatever set by the user.
   gci_images=( $(gcloud compute images list --project google-containers \
-      --regexp='gci-dev.*' --format='value(name)') )
+      --show-deprecated --no-standard-images --sort-by='~creationTimestamp' \
+      --regexp='gci-[a-z]+-52-.*' --format='table[no-heading](name)') )
   if [[ -z "${KUBE_GCE_MASTER_IMAGE:-}" ]]; then
     MASTER_IMAGE="${gci_images[0]}"
     MASTER_IMAGE_PROJECT="google-containers"