From fcd4a72f9ada8eca796b0c8ab4aee19970c7d4bd Mon Sep 17 00:00:00 2001
From: Shyam Jeedigunta <shyamjvs@google.com>
Date: Tue, 5 Sep 2017 13:04:36 +0200
Subject: [PATCH] Fix kubemark master-size and num-nodes config

---
 cluster/kubemark/gce/config-default.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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