Merge pull request #5575 from dchen1107/image

Upgrade to container-vm-20150315
pull/6/head
Victor Marmol 2015-03-17 17:14:52 -07:00
commit 8d70dd8719
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-v20150305
IMAGE=container-vm-v20150317
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-v20150305
IMAGE=container-vm-v20150317
IMAGE_PROJECT=google-containers
NETWORK=${KUBE_GCE_NETWORK:-e2e}
INSTANCE_PREFIX="${KUBE_GCE_INSTANCE_PREFIX:-e2e-test-${USER}}"