Fix kubemark master-size and num-nodes config

This commit is contained in:
Shyam Jeedigunta 2017-09-05 13:04:36 +02:00
parent ffed1d3408
commit fcd4a72f9a

View File

@ -24,10 +24,8 @@ source "${KUBE_ROOT}/cluster/gce/config-common.sh"
GCLOUD=gcloud GCLOUD=gcloud
ZONE=${KUBE_GCE_ZONE:-us-central1-b} ZONE=${KUBE_GCE_ZONE:-us-central1-b}
REGION=${ZONE%-*} REGION=${ZONE%-*}
# KUBEMARK_NUM_NODES overrides NUM_NODES if set NUM_NODES=${KUBEMARK_NUM_NODES:-10}
NUM_NODES=${KUBEMARK_NUM_NODES:-${NUM_NODES:-10}} MASTER_SIZE=${KUBEMARK_MASTER_SIZE:-n1-standard-$(get-master-size)}
# KUBEMARK_MASTER_SIZE overrides MASTER_SIZE if set
MASTER_SIZE=${KUBEMARK_MASTER_SIZE:-${MASTER_SIZE:-n1-standard-$(get-master-size)}}
MASTER_DISK_TYPE=pd-ssd MASTER_DISK_TYPE=pd-ssd
MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-20GB} MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-20GB}
MASTER_ROOT_DISK_SIZE=${KUBEMARK_MASTER_ROOT_DISK_SIZE:-10GB} MASTER_ROOT_DISK_SIZE=${KUBEMARK_MASTER_ROOT_DISK_SIZE:-10GB}