Merge pull request #31094 from wojtek-t/fix_density_tests

Automatic merge from submit-queue

Tweak resource consumption in density test

Fix: #30275
This commit is contained in:
Kubernetes Submit Queue 2016-08-22 02:50:24 -07:00 committed by GitHub
commit ce9697a79f

View File

@ -88,10 +88,10 @@ func density30AddonResourceVerifier(numNodes int) map[string]framework.ResourceC
schedulerMem = 500 * (1024 * 1024) schedulerMem = 500 * (1024 * 1024)
} else if numNodes <= 500 { } else if numNodes <= 500 {
apiserverCPU = 2.25 apiserverCPU = 2.25
apiserverMem = 2500 * (1024 * 1024) apiserverMem = 3300 * (1024 * 1024)
controllerCPU = 1.0 controllerCPU = 1.3
controllerMem = 1100 * (1024 * 1024) controllerMem = 1100 * (1024 * 1024)
schedulerCPU = 0.8 schedulerCPU = 1.0
schedulerMem = 500 * (1024 * 1024) schedulerMem = 500 * (1024 * 1024)
} else if numNodes <= 1000 { } else if numNodes <= 1000 {
apiserverCPU = 4 apiserverCPU = 4
@ -103,8 +103,10 @@ func density30AddonResourceVerifier(numNodes int) map[string]framework.ResourceC
} }
} else { } else {
if numNodes <= 100 { if numNodes <= 100 {
apiserverCPU = 1.5 // TODO: Investigate higher apiserver consumption and
apiserverMem = 1300 * (1024 * 1024) // potentially revert to 1.5cpu and 1.3GB - see #30871
apiserverCPU = 1.8
apiserverMem = 2000 * (1024 * 1024)
controllerCPU = 0.5 controllerCPU = 0.5
controllerMem = 300 * (1024 * 1024) controllerMem = 300 * (1024 * 1024)
schedulerCPU = 0.4 schedulerCPU = 0.4
@ -131,7 +133,7 @@ func density30AddonResourceVerifier(numNodes int) map[string]framework.ResourceC
MemoryConstraint: 100 * (1024 * 1024), MemoryConstraint: 100 * (1024 * 1024),
} }
constraints["kube-proxy"] = framework.ResourceConstraint{ constraints["kube-proxy"] = framework.ResourceConstraint{
CPUConstraint: 0.05, CPUConstraint: 0.1,
MemoryConstraint: 20 * (1024 * 1024), MemoryConstraint: 20 * (1024 * 1024),
} }
constraints["l7-lb-controller"] = framework.ResourceConstraint{ constraints["l7-lb-controller"] = framework.ResourceConstraint{