Skip to content

Commit

Permalink
Merge pull request #26826 from adityakali/automated-cherry-pick-of-#2…
Browse files Browse the repository at this point in the history
…6582-kube-release-1.2

Automated cherry pick of #26582
  • Loading branch information
roberthbailey committed Jun 6, 2016
2 parents e58faac + 9df4b48 commit c51fe37
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion cluster/gce/util.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit c51fe37

Please sign in to comment.