Merge pull request #32479 from gmarek/master

Automatic merge from submit-queue Relax the CPU constraint for L7 lb Ref. https://github.com/kubernetes/kubernetes/issues/32437#issuecomment-246215291

Merge pull request #32479 from gmarek/master
630d7ab6 · Kubernetes Submit Queue · GitHub · 6f875bb9 · a6e87891 · 630d7ab6
Commit 630d7ab6 authored Sep 12, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 12, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

density.go test/e2e/density.go +2 -2

No files found.
--- a/test/e2e/density.go
+++ b/test/e2e/density.go
@@ -73,7 +73,7 @@ func density30AddonResourceVerifier(numNodes int) map[string]framework.ResourceC
 	framework.Logf("Setting resource constraings for provider: %s", framework.TestContext.Provider)
 	if framework.ProviderIs("kubemark") {
 		if numNodes <= 5 {
-			apiserverCPU = 0.25
+			apiserverCPU = 0.35
 			apiserverMem = 150 * (1024 * 1024)
 			controllerCPU = 0.1
 			controllerMem = 100 * (1024 * 1024)
@@ -137,7 +137,7 @@ func density30AddonResourceVerifier(numNodes int) map[string]framework.ResourceC
 		MemoryConstraint: 20 * (1024 * 1024),
 	}
 	constraints["l7-lb-controller"] = framework.ResourceConstraint{
-		CPUConstraint:    0.1,
+		CPUConstraint:    0.15,
 		MemoryConstraint: 60 * (1024 * 1024),
 	}
 	constraints["influxdb"] = framework.ResourceConstraint{