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

Merge pull request #26583 from yujuhong/set_limits

Browse Source 
Automatic merge from submit-queue

kubelet e2e: set cpu/memory limits for docker 1.11

Docker 1.11 consumes more memory. Bump the limit to fix the tests. Also add
new limits for the 100-pod resource usage tracking test.

This fixes #26495
This commit is contained in:
k8s-merge-robot 2016-05-31 15:18:58 -07:00
commit c1c0567e37
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/e2e/kubelet_perf.go
View File

@ -235,17 +235,27 @@ var _ = framework.KubeDescribe("Kubelet [Serial] [Slow]", func() {
podsPerNode: 35, podsPerNode: 35,
cpuLimits: framework.ContainersCPUSummary{ cpuLimits: framework.ContainersCPUSummary{
stats.SystemContainerKubelet: {0.50: 0.12, 0.95: 0.14}, stats.SystemContainerKubelet: {0.50: 0.12, 0.95: 0.14},
stats.SystemContainerRuntime: {0.50: 0.06, 0.95: 0.08}, stats.SystemContainerRuntime: {0.50: 0.05, 0.95: 0.07},
}, },
// We set the memory limits generously because the distribution // We set the memory limits generously because the distribution
// of the addon pods affect the memory usage on each node. // of the addon pods affect the memory usage on each node.
memLimits: framework.ResourceUsagePerContainer{ memLimits: framework.ResourceUsagePerContainer{
stats.SystemContainerRuntime: &framework.ContainerResourceUsage{MemoryRSSInBytes: 100 * 1024 * 1024}, stats.SystemContainerKubelet: &framework.ContainerResourceUsage{MemoryRSSInBytes: 70 * 1024 * 1024},
stats.SystemContainerRuntime: &framework.ContainerResourceUsage{MemoryRSSInBytes: 150 * 1024 * 1024},
}, },
}, },
{ {
// TODO(yujuhong): Set the limits after collecting enough data. cpuLimits: framework.ContainersCPUSummary{
stats.SystemContainerKubelet: {0.50: 0.15, 0.95: 0.20},
stats.SystemContainerRuntime: {0.50: 0.06, 0.95: 0.09},
},
podsPerNode: 100, podsPerNode: 100,
// We set the memory limits generously because the distribution
// of the addon pods affect the memory usage on each node.
memLimits: framework.ResourceUsagePerContainer{
stats.SystemContainerKubelet: &framework.ContainerResourceUsage{MemoryRSSInBytes: 80 * 1024 * 1024},
stats.SystemContainerRuntime: &framework.ContainerResourceUsage{MemoryRSSInBytes: 300 * 1024 * 1024},
},
}, },
} }
for _, testArg := range rTests { for _, testArg := range rTests {