From 0c909cbf2a1f2cc8ba62fb4d8a9486cbe8c9eaae Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Fri, 26 May 2017 07:58:03 -0700 Subject: [PATCH] Default NODE_OS to gci on GCE installs Looking at https://github.com/kubernetes/test-infra/tree/master/jobs, any job with "cvm" in the name explicitly sets this variable, so I hope it is only the default. --- cluster/gce/config-default.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 5d3f74de520..b1ab40d6eda 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -42,7 +42,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:-debian}} +NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}} if [[ "${MASTER_OS_DISTRIBUTION}" == "coreos" ]]; then MASTER_OS_DISTRIBUTION="container-linux" fi