From 6fe3023a3dbd312f4df95ac75a6ae291ca18509f Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Thu, 18 Feb 2016 14:28:13 -0800 Subject: [PATCH 1/2] Revert "Upgrade gce cluster to docker 1.9.1" This reverts commit f07070d129fb2feaf50a011e81348afe5b95a938. --- cluster/saltbase/salt/docker/init.sls | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cluster/saltbase/salt/docker/init.sls b/cluster/saltbase/salt/docker/init.sls index e71f1139d7a..6898f34da8e 100644 --- a/cluster/saltbase/salt/docker/init.sls +++ b/cluster/saltbase/salt/docker/init.sls @@ -203,10 +203,10 @@ net.ipv4.ip_forward: {% 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.9.1-0~wheezy_amd64.deb' %} -{% set override_deb_sha1='d682e2f0545e21f2d7309c2d87826aa566cc4af0' %} -{% set override_docker_ver='1.9.1' %} +{% set docker_pkg_name='' %} +{% set override_deb='' %} +{% set override_deb_sha1='' %} +{% set override_docker_ver='' %} # Ubuntu presents as os_family=Debian, osfullname=Ubuntu {% elif grains.get('cloud', '') == 'aws' and grains.get('os_family', '') == 'Debian' From 7f94e3ecdc1156251b2a28609ed29ead7b8de8d3 Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Thu, 18 Feb 2016 15:00:50 -0800 Subject: [PATCH 2/2] Bump container-vm in 1.2 to container-v1-2-v20160218 (prerelease) --- 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 74b514db0d5..0bb09a7356d 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -31,7 +31,7 @@ PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false} OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} -MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20160217} +MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-v1-2-v20160218} 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 fda432f0064..24b0b39b931 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -32,7 +32,7 @@ PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false} OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} -MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20160217} +MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-v1-2-v20160218} 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}"}