From 8573f427eb55a181e5f8f293ebb75bb423e469f6 Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Thu, 6 Aug 2015 15:36:39 -0700 Subject: [PATCH] Update GCE to container-vm-v20150806 Also changes the node image to default to master image --- cluster/gce/config-default.sh | 6 +++--- cluster/gce/config-test.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index f6c5c6474b1..ac7b55493f2 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -28,10 +28,10 @@ MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB} REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-true} OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} -MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150715} +MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150806} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} -MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-container-vm-v20150715} -MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-google-containers} +MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-"${MASTER_IMAGE}"} +MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-"${MASTER_IMAGE_PROJECT}"} 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 2dd5e3616f4..10fbf2c3732 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -29,10 +29,10 @@ REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-false} KUBE_APISERVER_REQUEST_TIMEOUT=300 OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} -MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150715} +MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150806} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} -MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-container-vm-v20150715} -MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-google-containers} +MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-"${MASTER_IMAGE}"} +MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-"${MASTER_IMAGE_PROJECT}"} CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker} RKT_VERSION=${KUBE_RKT_VERSION:-0.5.5}