Skip to content

Commit

Permalink
pin GCI version to milestone 52
Browse files Browse the repository at this point in the history
This is mainly for pinning the 1.2 branch to GCI milestone 52
which contains correct docker and kubelet built in.
Doing this allows us to upgrade docker to v1.11 (issue #26455)
in GCI 53 without breaking the 1.2 release branch.
  • Loading branch information
adityakali committed Jun 3, 2016
1 parent e58faac commit 9df4b48
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 9df4b48

Please sign in to comment.