Merge pull request #47971 from yujuhong/bump-usage-limit

Automatic merge from submit-queue (batch tested with PRs 48074, 47971, 48044, 47514, 47647) e2e: bump kubelet's resurce usage limit We don't have per-OS image limits. Bumping these to more generous numbers to not fail the tests.

Merge pull request #47971 from yujuhong/bump-usage-limit
36ae4ae4 · Kubernetes Submit Queue · GitHub · cb1f5605 · 71bd92ce · 36ae4ae4
Commit 36ae4ae4 authored Jun 26, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 26, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

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

resource_usage_test.go test/e2e_node/resource_usage_test.go +1 -1

No files found.
--- a/test/e2e/kubelet_perf.go
+++ b/test/e2e/kubelet_perf.go
@@ -244,7 +244,7 @@ var _ = framework.KubeDescribe("Kubelet [Serial] [Slow]", func() {
 					stats.SystemContainerRuntime: {0.50: 0.10, 0.95: 0.20},
 				},
 				memLimits: framework.ResourceUsagePerContainer{
-					stats.SystemContainerKubelet: &framework.ContainerResourceUsage{MemoryRSSInBytes: 70 * 1024 * 1024},
+					stats.SystemContainerKubelet: &framework.ContainerResourceUsage{MemoryRSSInBytes: 200 * 1024 * 1024},
 					// The detail can be found at https://github.com/kubernetes/kubernetes/issues/28384#issuecomment-244158892
 					stats.SystemContainerRuntime: &framework.ContainerResourceUsage{MemoryRSSInBytes: 125 * 1024 * 1024},
 				},
@@ -256,7 +256,7 @@ var _ = framework.KubeDescribe("Kubelet [Serial] [Slow]", func() {
 				},
 				podsPerNode: 100,
 				memLimits: framework.ResourceUsagePerContainer{
-					stats.SystemContainerKubelet: &framework.ContainerResourceUsage{MemoryRSSInBytes: 120 * 1024 * 1024},
+					stats.SystemContainerKubelet: &framework.ContainerResourceUsage{MemoryRSSInBytes: 300 * 1024 * 1024},
 					stats.SystemContainerRuntime: &framework.ContainerResourceUsage{MemoryRSSInBytes: 300 * 1024 * 1024},
 				},
 			},

--- a/test/e2e_node/resource_usage_test.go
+++ b/test/e2e_node/resource_usage_test.go
@@ -71,7 +71,7 @@ var _ = framework.KubeDescribe("Resource-usage [Serial] [Slow]", func() {
 					stats.SystemContainerRuntime: {0.50: 0.30, 0.95: 0.40},
 				},
 				memLimits: framework.ResourceUsagePerContainer{
-					stats.SystemContainerKubelet: &framework.ContainerResourceUsage{MemoryRSSInBytes: 100 * 1024 * 1024},
+					stats.SystemContainerKubelet: &framework.ContainerResourceUsage{MemoryRSSInBytes: 200 * 1024 * 1024},
 					stats.SystemContainerRuntime: &framework.ContainerResourceUsage{MemoryRSSInBytes: 400 * 1024 * 1024},
 				},
 			},