From 20408cad179f95479f4aae6a8e1e47eccbce223b Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Sat, 4 Jun 2016 20:37:25 -0700 Subject: [PATCH] Bump GCE debian image to container-v1-3-v20160604 Includes Docker 1.11.2 Wait for enough results from http://kubekins.dls.corp.google.com/job/kubernetes-e2e-gce-container-vm/ before merging. c.f. https://github.com/kubernetes/test-infra/pull/116 --- 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 3e9e3b1f5a9..c53995d2b74 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -40,7 +40,7 @@ OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-gci} # By default a cluster will be started with the master on GCI and nodes on # containervm. If you are updating the containervm version, update this # variable. -CVM_VERSION=container-v1-3-v20160517 +CVM_VERSION=container-v1-3-v20160604 MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"} diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 7bfb4d1ab69..d63ae0605dc 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -41,7 +41,7 @@ OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-gci} # By default a cluster will be started with the master on GCI and nodes on # containervm. If you are updating the containervm version, update this # variable. -CVM_VERSION=container-v1-3-v20160517 +CVM_VERSION=container-v1-3-v20160604 MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"}