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.
This commit is contained in:
Tim Hockin 2017-05-26 07:58:03 -07:00
parent 25aa600360
commit 0c909cbf2a

View File

@ -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