diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index f76f83819b2..6fa4e4be4f4 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -26,7 +26,7 @@ MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-20GB} MINION_DISK_TYPE=pd-standard MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB} REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-true} -PREEMPTIBLE_MINION=false +PREEMPTIBLE_MINION=${PREEMPTIBLE_MINION:-false} OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150806} diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 9999804f6e9..316d59f2349 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -27,7 +27,7 @@ MINION_DISK_TYPE=pd-standard MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB} REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-false} KUBE_APISERVER_REQUEST_TIMEOUT=300 -PREEMPTIBLE_MINION=false +PREEMPTIBLE_MINION=${PREEMPTIBLE_MINION:-false} OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150806} diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 08c37d2017b..c4f2f21396a 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -401,7 +401,7 @@ function create-node-template { local preemptible_minions="" if [[ "${PREEMPTIBLE_MINION}" == "true" ]]; then preemptible_minions="--preemptible --maintenance-policy TERMINATE" - fi + fi while true; do echo "Attempt ${attempt} to create ${1}" >&2 if ! gcloud compute instance-templates create "$1" \ @@ -412,7 +412,8 @@ function create-node-template { --image-project="${MINION_IMAGE_PROJECT}" \ --image "${MINION_IMAGE}" \ --tags "${MINION_TAG}" \ - --network "${NETWORK}" ${preemptible_minions} \ + --network "${NETWORK}" \ + ${preemptible_minions} \ $2 \ --can-ip-forward \ --metadata-from-file "$3","$4" >&2; then