github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27210 from adityakali/gci53

Browse Source 
Automatic merge from submit-queue

version bump for gci to milestone 53

Fixes #26455

GCI release 53 includes kubernetes v1.3.0-alpha.5 with docker-1.11.2.

@dchen1107 @kubernetes/goog-image @andyzheng0831
This commit is contained in:
k8s-merge-robot 2016-06-13 13:54:46 -07:00 committed by GitHub
commit 45bb6824ff
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/util.sh
View File

@ -35,7 +35,7 @@ if [[ "${OS_DISTRIBUTION}" == "gci" ]]; then
# Otherwise, we respect whatever is set by the user.
gci_images=( $(gcloud compute images list --project google-containers \
--show-deprecated --no-standard-images --sort-by='~creationTimestamp' \
--regexp='gci-[a-z]+-52-.*' --format='table[no-heading](name)') )
--regexp='gci-[a-z]+-53-.*' --format='table[no-heading](name)') )
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-"${gci_images[0]}"}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
# The default node image when using GCI is still the Debian based ContainerVM