github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-11 13:02:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #37230 from hongchaodeng/km

Browse Source 
Automatic merge from submit-queue

kubemark: add KUBEMARK_NUM_NODES and KUBEMARK_MASTER_SIZE config

A lot of test infra scripts are using these two parameters and repeatedly set NUM_NODES and MASTER_SIZE before running kubemark. When we try to use those scripts, we need to manually set these again and again.

It would come handy if kubemark config could take these into account and reduce duplication.
This commit is contained in:
Kubernetes Submit Queue 2016-11-30 01:26:27 -08:00 committed by GitHub
commit b229ceee7a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,8 +24,10 @@ source "${KUBE_ROOT}/cluster/gce/config-common.sh"
GCLOUD=gcloud
ZONE=${KUBE_GCE_ZONE:-us-central1-b}
REGION=${ZONE%-*}
NUM_NODES=${NUM_NODES:-100}
MASTER_SIZE=${MASTER_SIZE:-n1-standard-$(get-master-size)}
# KUBEMARK_NUM_NODES overrides NUM_NODES if set
NUM_NODES=${KUBEMARK_NUM_NODES:-${NUM_NODES:-100}}
# 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_SIZE=${MASTER_DISK_SIZE:-20GB}
MASTER_ROOT_DISK_SIZE=${KUBEMARK_MASTER_ROOT_DISK_SIZE:-10GB}