Merge pull request #4062 from dchen1107/image

Upgrade to container-vm-v20150129 image
pull/6/head
Alex Robinson 2015-02-03 10:50:28 -08:00
commit 793677e8e2
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 # TODO(dchen1107): Filed an internal issue to create an alias
# for containervm image, so that gcloud will expand this # for containervm image, so that gcloud will expand this
# to the latest supported image. # to the latest supported image.
IMAGE=container-vm-v20150112 IMAGE=container-vm-v20150129
IMAGE_PROJECT=google-containers IMAGE_PROJECT=google-containers
NETWORK=${KUBE_GCE_NETWORK:-default} NETWORK=${KUBE_GCE_NETWORK:-default}
INSTANCE_PREFIX="${KUBE_GCE_INSTANCE_PREFIX:-kubernetes}" 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 # TODO(dchen1107): Filed an internal issue to create an alias
# for containervm image, so that gcloud will expand this # for containervm image, so that gcloud will expand this
# to the latest supported image. # to the latest supported image.
IMAGE=container-vm-v20150112 IMAGE=container-vm-v20150129
IMAGE_PROJECT=google-containers IMAGE_PROJECT=google-containers
NETWORK=${KUBE_GCE_NETWORK:-e2e} NETWORK=${KUBE_GCE_NETWORK:-e2e}
INSTANCE_PREFIX="${KUBE_GCE_INSTANCE_PREFIX:-e2e-test-${USER}}" INSTANCE_PREFIX="${KUBE_GCE_INSTANCE_PREFIX:-e2e-test-${USER}}"