Commit 0f88d149 authored by Daniel Smith's avatar Daniel Smith

Merge pull request #2818 from dchen1107/containervm

Using container-vm-v20141208 as the default image on GCE.
parents 9a1fea69 d767e714
...@@ -22,7 +22,7 @@ NUM_MINIONS=4 ...@@ -22,7 +22,7 @@ NUM_MINIONS=4
# 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-v20141016 IMAGE=container-vm-v20141208
IMAGE_PROJECT=google-containers IMAGE_PROJECT=google-containers
NETWORK=default NETWORK=default
INSTANCE_PREFIX=kubernetes INSTANCE_PREFIX=kubernetes
......
...@@ -22,7 +22,7 @@ NUM_MINIONS=2 ...@@ -22,7 +22,7 @@ NUM_MINIONS=2
# 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-v20141016 IMAGE=container-vm-v20141208
IMAGE_PROJECT=google-containers IMAGE_PROJECT=google-containers
NETWORK=e2e NETWORK=e2e
INSTANCE_PREFIX="e2e-test-${USER}" INSTANCE_PREFIX="e2e-test-${USER}"
......
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