github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32479 from gmarek/master

Browse Source 
Automatic merge from submit-queue

Relax the CPU constraint for L7 lb

Ref. https://github.com/kubernetes/kubernetes/issues/32437#issuecomment-246215291
This commit is contained in:
Kubernetes Submit Queue 2016-09-12 02:39:56 -07:00 committed by GitHub
commit 630d7ab6d9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/density.go
View File

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