Skip to content

K
k3s
Unverified Commit c7362af7 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #66562 from bclau/tests/init_container_memory_limit

Automatic merge from submit-queue (batch tested with PRs 62901, 66562, 66938, 66927, 66926). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Sets higher memory limit for init_container tests **What this PR does / why we need it**: /sig testing Currently, the limit set in the tests is 30 MB, which will cause the Docker service on the Windows nodes to hang and be no longer responsive. This will cause the Kubelet service to enter a NotReady state. Setting a higher memory limit (50 MB) will avoid this issue. **Which issue(s) this PR fixes**: Fixes #37429 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
parents f5772e3d c089b638
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
test/e2e/common/init_container.go
View file @ c7362af7
...@@ -131,7 +131,7 @@ var _ = framework.KubeDescribe("InitContainer [NodeConformance]", func() { ...@@ -131,7 +131,7 @@ var _ = framework.KubeDescribe("InitContainer [NodeConformance]", func() {
Resources: v1.ResourceRequirements{ Resources: v1.ResourceRequirements{
Limits: v1.ResourceList{ Limits: v1.ResourceList{
v1.ResourceCPU: *resource.NewMilliQuantity(100, resource.DecimalSI), v1.ResourceCPU: *resource.NewMilliQuantity(100, resource.DecimalSI),
v1.ResourceMemory: *resource.NewQuantity(30*1024*1024, resource.DecimalSI), v1.ResourceMemory: *resource.NewQuantity(50*1024*1024, resource.DecimalSI),
}, },
}, },
}, },
...@@ -193,7 +193,7 @@ var _ = framework.KubeDescribe("InitContainer [NodeConformance]", func() { ...@@ -193,7 +193,7 @@ var _ = framework.KubeDescribe("InitContainer [NodeConformance]", func() {
Resources: v1.ResourceRequirements{ Resources: v1.ResourceRequirements{
Limits: v1.ResourceList{ Limits: v1.ResourceList{
v1.ResourceCPU: *resource.NewMilliQuantity(100, resource.DecimalSI), v1.ResourceCPU: *resource.NewMilliQuantity(100, resource.DecimalSI),
v1.ResourceMemory: *resource.NewQuantity(30*1024*1024, resource.DecimalSI), v1.ResourceMemory: *resource.NewQuantity(50*1024*1024, resource.DecimalSI),
}, },
}, },
}, },
...@@ -302,7 +302,7 @@ var _ = framework.KubeDescribe("InitContainer [NodeConformance]", func() { ...@@ -302,7 +302,7 @@ var _ = framework.KubeDescribe("InitContainer [NodeConformance]", func() {
Resources: v1.ResourceRequirements{ Resources: v1.ResourceRequirements{
Limits: v1.ResourceList{ Limits: v1.ResourceList{
v1.ResourceCPU: *resource.NewMilliQuantity(100, resource.DecimalSI), v1.ResourceCPU: *resource.NewMilliQuantity(100, resource.DecimalSI),
v1.ResourceMemory: *resource.NewQuantity(30*1024*1024, resource.DecimalSI), v1.ResourceMemory: *resource.NewQuantity(50*1024*1024, resource.DecimalSI),
}, },
}, },
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment