Skip to content

Commit

Permalink
Merge pull request kubernetes#36771 from euank/bump-some-memory
Browse files Browse the repository at this point in the history
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 kubernetes#36159

Fix based on kubernetes#36159 (comment)

cc @yujuhong @saad-ali
  • Loading branch information
Kubernetes Submit Queue committed Nov 15, 2016
2 parents c1b2481 + 08382c1 commit 122a228
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions test/e2e/common/init_container.go
Original file line number Diff line number Diff line change
Expand Up @@ -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),
},
},
},
Expand Down Expand Up @@ -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),
},
},
},
Expand Down Expand Up @@ -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),
},
},
},
Expand Down

0 comments on commit 122a228

Please sign in to comment.