Skip to content

K
k3s
Commit 45bb6824 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #27210 from adityakali/gci53

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
parents d9f78853 4dde9a66
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cluster/gce/util.sh
View file @ 45bb6824
...@@ -35,7 +35,7 @@ if [[ "${OS_DISTRIBUTION}" == "gci" ]]; then ...@@ -35,7 +35,7 @@ if [[ "${OS_DISTRIBUTION}" == "gci" ]]; then
# Otherwise, we respect whatever is set by the user. # Otherwise, we respect whatever is set by the user.
gci_images=( $(gcloud compute images list --project google-containers \ gci_images=( $(gcloud compute images list --project google-containers \
--show-deprecated --no-standard-images --sort-by='~creationTimestamp' \ --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=${KUBE_GCE_MASTER_IMAGE:-"${gci_images[0]}"}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
# The default node image when using GCI is still the Debian based ContainerVM # The default node image when using GCI is still the Debian based ContainerVM
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment