Merge pull request #3485 from dchen1107/master

Upgrade OSS k8s on GCE to latest containervm image: container-vm-v201501...
pull/6/head
Daniel Smith 2015-01-14 16:30:20 -08:00
commit 53bef57b34
2 changed files with 2 additions and 2 deletions

View File

@ -26,7 +26,7 @@ MINION_DISK_SIZE=10GB
# TODO(dchen1107): Filed an internal issue to create an alias
# for containervm image, so that gcloud will expand this
# to the latest supported image.
IMAGE=container-vm-v20141208
IMAGE=container-vm-v20150112
IMAGE_PROJECT=google-containers
NETWORK=${KUBE_GCE_NETWORK:-default}
INSTANCE_PREFIX="${KUBE_GCE_INSTANCE_PREFIX:-kubernetes}"

View File

@ -26,7 +26,7 @@ MINION_DISK_SIZE=10GB
# TODO(dchen1107): Filed an internal issue to create an alias
# for containervm image, so that gcloud will expand this
# to the latest supported image.
IMAGE=container-vm-v20141208
IMAGE=container-vm-v20150112
IMAGE_PROJECT=google-containers
NETWORK=${KUBE_GCE_NETWORK:-e2e}
INSTANCE_PREFIX="${KUBE_GCE_INSTANCE_PREFIX:-e2e-test-${USER}}"