From ddb75f513026c0356fa3ff2db79c5686b778ba54 Mon Sep 17 00:00:00 2001 From: gmarek Date: Wed, 16 Mar 2016 17:38:55 +0100 Subject: [PATCH] Use get-mater-size function in kubemark config --- cluster/kubemark/config-default.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cluster/kubemark/config-default.sh b/cluster/kubemark/config-default.sh index 344f7f76a0e..aecc560ea35 100644 --- a/cluster/kubemark/config-default.sh +++ b/cluster/kubemark/config-default.sh @@ -19,10 +19,12 @@ # gce/util.sh script which assumes config filename), but if some things that # are enabled by default should not run in hollow clusters, they should be disabled here. +source "${KUBE_ROOT}/cluster/gce/config-common.sh" + GCLOUD=gcloud ZONE=${KUBE_GCE_ZONE:-us-central1-b} -MASTER_SIZE=${MASTER_SIZE:-n1-standard-4} NUM_NODES=${NUM_NODES:-100} +MASTER_SIZE=${MASTER_SIZE:-n1-standard-$(get-master-size)} MASTER_DISK_TYPE=pd-ssd MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-20GB} REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-false}