From 6e610296b92c3aeedf638f1c44906f429b42e163 Mon Sep 17 00:00:00 2001 From: Shyam Jeedigunta Date: Mon, 16 Oct 2017 13:06:04 +0200 Subject: [PATCH] Auto-calculate master disksize and cluster IP range in kubemark --- cluster/kubemark/gce/config-default.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/kubemark/gce/config-default.sh b/cluster/kubemark/gce/config-default.sh index 454bfb8d6e7..7aa0b590ddb 100644 --- a/cluster/kubemark/gce/config-default.sh +++ b/cluster/kubemark/gce/config-default.sh @@ -27,8 +27,8 @@ REGION=${ZONE%-*} 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} +MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-$(get-master-disk-size)} +MASTER_ROOT_DISK_SIZE=${KUBEMARK_MASTER_ROOT_DISK_SIZE:-$(get-master-root-disk-size)} REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-false} PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false} NODE_ACCELERATORS=${NODE_ACCELERATORS:-""} @@ -55,7 +55,7 @@ MASTER_TAG="kubemark-master" ETCD_QUORUM_READ="${ENABLE_ETCD_QUORUM_READ:-false}" EVENT_STORE_NAME="${INSTANCE_PREFIX}-event-store" MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}" -CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.224.0.0/11}" +CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-$(get-cluster-ip-range)}" RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}" TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100} KUBE_APISERVER_REQUEST_TIMEOUT=300