github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2017-09-05 05:01:49 -07:00 committed by GitHub
commit 6a314ce3a9
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/kubemark/gce/config-default.sh
View File

@ -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}