From 6c5b4761c8ca51c8deb9f9edefa795b89cacfdc5 Mon Sep 17 00:00:00 2001 From: Michael Taufen Date: Tue, 15 Nov 2016 08:34:05 -0800 Subject: [PATCH] K8s 1.5 keeps container-vm as default node image on GCE There is a concern that some GCE users may be running automation that (a) turns up ephemeral clusters and (b) always uses the latest K8s release. If any of these workloads fall outside the set supported on GCI, cutting the release will break the automation. We are therefore delaying this change until we have provided sufficient warning. --- 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 d445e05c463..01d862e9654 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -38,7 +38,7 @@ KUBE_DELETE_NODES=${KUBE_DELETE_NODES:-true} KUBE_DELETE_NETWORK=${KUBE_DELETE_NETWORK:-false} MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}} -NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}} +NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-debian}} # 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. Also please update corresponding image for node e2e at: diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 2835c6853d7..c44989bd76c 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -39,7 +39,7 @@ KUBE_DELETE_NODES=${KUBE_DELETE_NODES:-true} KUBE_DELETE_NETWORK=${KUBE_DELETE_NETWORK:-true} MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}} -NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}} +NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-debian}} # 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. Also please update corresponding image for node e2e at: