Merge pull request kubernetes#22934 from gmarek/master

Auto commit by PR queue bot
xfye · Mar 14, 2016 · 323f5c4 · 323f5c4
2 parents c195b57 + c325319
commit 323f5c4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
@@ -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}))
 }

diff --git a/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e-gce-enormous-startup.yaml b/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e-gce-enormous-startup.yaml
@@ -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}