diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 659af93d788..6f778651bf0 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -63,15 +63,16 @@ if [[ "${NODE_OS_DISTRIBUTION}" == "debian" ]]; then NODE_ACCELERATORS="" fi -# 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: +# By default a cluster will be started with the master and nodes +# on Container-optimized OS (cos, previously known as gci). If +# you are updating the os image versions, update this variable. +# Also please update corresponding image for node e2e at: # https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml CVM_VERSION=${CVM_VERSION:-container-vm-v20170627} GCI_VERSION=${KUBE_GCI_VERSION:-cos-stable-59-9460-64-0} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud} -NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}} +NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${GCI_VERSION}} GCE_API_ENDPOINT=${KUBE_GCE_API_ENDPOINT:-} NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-cos-cloud} CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker}