From f69cc2cd962b3ba268f7a9559438ce15107d5160 Mon Sep 17 00:00:00 2001 From: wojtekt Date: Wed, 28 Oct 2020 13:04:26 +0100 Subject: [PATCH] Update function setting master node size for GCE --- cluster/gce/config-common.sh | 6 +++--- cluster/gce/config-default.sh | 2 ++ cluster/gce/config-test.sh | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cluster/gce/config-common.sh b/cluster/gce/config-common.sh index 2c54864f96b..a84836f4864 100644 --- a/cluster/gce/config-common.sh +++ b/cluster/gce/config-common.sh @@ -34,16 +34,16 @@ function get-master-size { if [[ "$(get-num-nodes)" -gt "10" ]]; then suggested_master_size=4 fi - if [[ "$(get-num-nodes)" -gt "100" ]]; then + if [[ "$(get-num-nodes)" -gt "50" ]]; then suggested_master_size=8 fi - if [[ "$(get-num-nodes)" -gt "250" ]]; then + if [[ "$(get-num-nodes)" -gt "100" ]]; then suggested_master_size=16 fi if [[ "$(get-num-nodes)" -gt "500" ]]; then suggested_master_size=32 fi - if [[ "$(get-num-nodes)" -gt "3000" ]]; then + if [[ "$(get-num-nodes)" -gt "2000" ]]; then suggested_master_size=64 fi echo "${suggested_master_size}" diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 444b34a8aa7..1346d6e79b3 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -27,9 +27,11 @@ ZONE=${KUBE_GCE_ZONE:-us-central1-b} export REGION=${ZONE%-*} RELEASE_REGION_FALLBACK=${RELEASE_REGION_FALLBACK:-false} REGIONAL_KUBE_ADDONS=${REGIONAL_KUBE_ADDONS:-true} +# TODO: Migrate to e2-standard machine family. NODE_SIZE=${NODE_SIZE:-n1-standard-2} NUM_NODES=${NUM_NODES:-3} NUM_WINDOWS_NODES=${NUM_WINDOWS_NODES:-0} +# TODO: Migrate to e2-standard machine family. MASTER_SIZE=${MASTER_SIZE:-n1-standard-$(get-master-size)} MASTER_MIN_CPU_ARCHITECTURE=${MASTER_MIN_CPU_ARCHITECTURE:-} # To allow choosing better architectures. export MASTER_DISK_TYPE=pd-ssd diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 37a97148ac3..45c259844a5 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -26,9 +26,11 @@ ZONE=${KUBE_GCE_ZONE:-us-central1-b} export REGION=${ZONE%-*} RELEASE_REGION_FALLBACK=${RELEASE_REGION_FALLBACK:-false} REGIONAL_KUBE_ADDONS=${REGIONAL_KUBE_ADDONS:-true} +# TODO: Migrate to e2-standard machine family. NODE_SIZE=${NODE_SIZE:-n1-standard-2} NUM_NODES=${NUM_NODES:-3} NUM_WINDOWS_NODES=${NUM_WINDOWS_NODES:-0} +# TODO: Migrate to e2-standard machine family. MASTER_SIZE=${MASTER_SIZE:-n1-standard-$(get-master-size)} MASTER_MIN_CPU_ARCHITECTURE=${MASTER_MIN_CPU_ARCHITECTURE:-} # To allow choosing better architectures. export MASTER_DISK_TYPE=pd-ssd