Merge pull request #36771 from euank/bump-some-memory

Automatic merge from submit-queue tests: update memory resource limits ```release-note NONE ``` On ubuntu, the `RestartNever` test OOMs its cgroup limit fairly frequently. This bumps the number up to something suitably large since the test isn't testing anything related to this anyways. Fixes #36159 Fix based on https://github.com/kubernetes/kubernetes/issues/36159#issuecomment-258992255 cc @yujuhong @saad-ali

Merge pull request #36771 from euank/bump-some-memory
122a228b · Kubernetes Submit Queue · GitHub · c1b24815 · 08382c16 · 122a228b
Commit 122a228b authored Nov 14, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 14, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

init_container.go test/e2e/common/init_container.go +3 -3

No files found.
--- a/test/e2e/common/init_container.go
+++ b/test/e2e/common/init_container.go
@@ -132,7 +132,7 @@ var _ = framework.KubeDescribe("InitContainer", func() {
 						Resources: api.ResourceRequirements{
 							Limits: api.ResourceList{
 								api.ResourceCPU:    *resource.NewMilliQuantity(100, resource.DecimalSI),
-								api.ResourceMemory: *resource.NewQuantity(10*1024*1024, resource.DecimalSI),
+								api.ResourceMemory: *resource.NewQuantity(30*1024*1024, resource.DecimalSI),
 							},
 						},
 					},
@@ -195,7 +195,7 @@ var _ = framework.KubeDescribe("InitContainer", func() {
 						Resources: api.ResourceRequirements{
 							Limits: api.ResourceList{
 								api.ResourceCPU:    *resource.NewMilliQuantity(100, resource.DecimalSI),
-								api.ResourceMemory: *resource.NewQuantity(10*1024*1024, resource.DecimalSI),
+								api.ResourceMemory: *resource.NewQuantity(30*1024*1024, resource.DecimalSI),
 							},
 						},
 					},
@@ -306,7 +306,7 @@ var _ = framework.KubeDescribe("InitContainer", func() {
 						Resources: api.ResourceRequirements{
 							Limits: api.ResourceList{
 								api.ResourceCPU:    *resource.NewMilliQuantity(100, resource.DecimalSI),
-								api.ResourceMemory: *resource.NewQuantity(10*1024*1024, resource.DecimalSI),
+								api.ResourceMemory: *resource.NewQuantity(30*1024*1024, resource.DecimalSI),
 							},
 						},
 					},