github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2016-11-14 16:59:19 -08:00 committed by GitHub
commit 122a228b63
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/common/init_container.go
View File

@ -132,7 +132,7 @@ var _ = framework.KubeDescribe("InitContainer", func() {
Resources: api.ResourceRequirements{ Resources: api.ResourceRequirements{
Limits: api.ResourceList{ Limits: api.ResourceList{
api.ResourceCPU: *resource.NewMilliQuantity(100, resource.DecimalSI), 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{ Resources: api.ResourceRequirements{
Limits: api.ResourceList{ Limits: api.ResourceList{
api.ResourceCPU: *resource.NewMilliQuantity(100, resource.DecimalSI), 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{ Resources: api.ResourceRequirements{
Limits: api.ResourceList{ Limits: api.ResourceList{
api.ResourceCPU: *resource.NewMilliQuantity(100, resource.DecimalSI), 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),
}, },
}, },
}, },