From 7996bf3393993591f00023a9acde0f278261baac Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Wed, 16 Dec 2015 13:08:24 -0800 Subject: [PATCH] Bump to container-vm-v20151215: New kubelet version (which doesn't matter), no new Docker version, new base bits. Cherry-pickable to 1.1. --- cluster/gce/config-default.sh | 2 +- cluster/gce/config-test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 95d7575446d86..d5e56c27106e1 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -29,7 +29,7 @@ REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-true} PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false} OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} -MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20151103} +MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20151215} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"} NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-"${MASTER_IMAGE_PROJECT}"} diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 7a452158b8e65..1f134442655ac 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -30,7 +30,7 @@ KUBE_APISERVER_REQUEST_TIMEOUT=300 PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false} OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} -MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20151103} +MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20151215} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"} NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-"${MASTER_IMAGE_PROJECT}"}