Skip to content

K
k3s
Commit 6a314ce3 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #51948 from shyamjvs/kubemark-config-fix

Automatic merge from submit-queue Fix kubemark master-size and num-nodes config Should fix the kubemark part of https://github.com/kubernetes/kubernetes/issues/51899
parents 3a5622db fcd4a72f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
cluster/kubemark/gce/config-default.sh
View file @ 6a314ce3
...@@ -24,10 +24,8 @@ source "${KUBE_ROOT}/cluster/gce/config-common.sh" ...@@ -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}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment