github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #22934 from gmarek/master 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2016-03-14 05:47:23 -07:00
parent c195b574fe c325319ccb
commit 323f5c4fdb
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/gce/util.sh
View File

@ -698,11 +698,11 @@ function create-nodes-template() {
# exports:
# - NUM_MIGS
function set_num_migs() {
local defaulted_max_instances_per_mig=${MAX_INSTANCES_PER_MIG:-500}
local defaulted_max_instances_per_mig=${MAX_INSTANCES_PER_MIG:-1000}
if [[ ${defaulted_max_instances_per_mig} -le "0" ]]; then
echo "MAX_INSTANCES_PER_MIG cannot be negative. Assuming default 500"
defaulted_max_instances_per_mig=500
echo "MAX_INSTANCES_PER_MIG cannot be negative. Assuming default 1000"
defaulted_max_instances_per_mig=1000
fi
export NUM_MIGS=$(((${NUM_NODES} + ${defaulted_max_instances_per_mig} - 1) / ${defaulted_max_instances_per_mig}))
}

1
hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e-gce-enormous-startup.yaml
View File

@ -25,7 +25,6 @@
export NUM_NODES="1000"
# Reduce logs verbosity
export TEST_CLUSTER_LOG_LEVEL="--v=1"
export MAX_INSTANCES_PER_MIG="1000"
# Increase resync period to simulate production
export TEST_CLUSTER_RESYNC_PERIOD="--min-resync-period=12h"
{post-env}