diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index f22ececffc32..d3ff439d3cc0 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -29,7 +29,7 @@ REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-false} PREEMPTIBLE_MINION=${PREEMPTIBLE_MINION:-false} OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} -MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150806} +MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20151103} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-"${MASTER_IMAGE}"} MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-"${MASTER_IMAGE_PROJECT}"} diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 79c41fd1554b..b2111cba49e7 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -30,7 +30,7 @@ KUBE_APISERVER_REQUEST_TIMEOUT=300 PREEMPTIBLE_MINION=${PREEMPTIBLE_MINION:-false} OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} -MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150806} +MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20151103} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-"${MASTER_IMAGE}"} MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-"${MASTER_IMAGE_PROJECT}"} diff --git a/cluster/saltbase/salt/docker/init.sls b/cluster/saltbase/salt/docker/init.sls index 83ed8b63d40a..5bad7c4001d7 100644 --- a/cluster/saltbase/salt/docker/init.sls +++ b/cluster/saltbase/salt/docker/init.sls @@ -99,16 +99,13 @@ net.ipv4.ip_forward: {% set storage_base='https://storage.googleapis.com/kubernetes-release/docker/' %} -# Only upgrade Docker to 1.8.3 for the containerVM image. -# TODO(dchen1107): For release 1.1, we want to update the ContainerVM image to -# include Docker 1.8.3 and comment out the upgrade below. {% if grains.get('cloud', '') == 'gce' and grains.get('os_family', '') == 'Debian' and grains.get('oscodename', '') == 'wheezy' -%} -{% set docker_pkg_name='docker-engine' %} -{% set override_deb='docker-engine_1.8.3-0~wheezy_amd64.deb' %} -{% set override_deb_sha1='f812e1134e7375b29886a372a6e24d04e1ee33c9' %} -{% set override_docker_ver='1.8.3-0~wheezy' %} +{% set docker_pkg_name='' %} +{% set override_deb='' %} +{% set override_deb_sha1='' %} +{% set override_docker_ver='' %} {% else %} {% set docker_pkg_name='lxc-docker-1.7.1' %} {% set override_docker_ver='1.7.1' %}