From c03170821970ef2612d7096148a9a855153941f9 Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Thu, 11 Jun 2015 16:08:02 -0700 Subject: [PATCH] Update GCE/debian to container-vm-v20150611 Updates: - Docker 1.6.2 - /sys/fs/cgroup/memory/memory.use_hierarchy=1 --- cluster/gce/config-default.sh | 4 ++-- cluster/gce/config-test.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 949aa3f5fb7..3eec2f3beb8 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -27,9 +27,9 @@ MINION_DISK_TYPE=pd-standard MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB} OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} -MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150505} +MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150611} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} -MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-container-vm-v20150505} +MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-container-vm-v20150611} MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-google-containers} CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker} RKT_VERSION=${KUBE_RKT_VERSION:-0.5.5} diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index d8035a4c84a..dc7c725562e 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -28,9 +28,9 @@ MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB} KUBE_APISERVER_REQUEST_TIMEOUT=300 OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} -MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150505} +MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150611} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} -MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-container-vm-v20150505} +MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-container-vm-v20150611} MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-google-containers} CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker} RKT_VERSION=${KUBE_RKT_VERSION:-0.5.5}