Skip to content

K
k3s
Unverified Commit 4ef32ffb authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #74037 from mikebrow/automated-cherry-pick-of-#73016-upstream-release-1.13

Automated cherry pick of #73016: Bump the pod memory to higher levels to work on power
parents 046d69bd f7c6c619
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
test/e2e_node/summary_test.go
View file @ 4ef32ffb
...@@ -113,9 +113,9 @@ var _ = framework.KubeDescribe("Summary API [NodeConformance]", func() { ...@@ -113,9 +113,9 @@ var _ = framework.KubeDescribe("Summary API [NodeConformance]", func() {
"Time": recent(maxStatsAge), "Time": recent(maxStatsAge),
// Pods are limited by Node Allocatable // Pods are limited by Node Allocatable
"AvailableBytes": bounded(1*framework.Kb, memoryLimit), "AvailableBytes": bounded(1*framework.Kb, memoryLimit),
"UsageBytes": bounded(10*framework.Kb, 50*framework.Mb), "UsageBytes": bounded(10*framework.Kb, 400*framework.Mb),
"WorkingSetBytes": bounded(10*framework.Kb, 50*framework.Mb), "WorkingSetBytes": bounded(10*framework.Kb, 400*framework.Mb),
"RSSBytes": bounded(1*framework.Kb, 20*framework.Mb), "RSSBytes": bounded(1*framework.Kb, 160*framework.Mb),
"PageFaults": bounded(0, 1000000), "PageFaults": bounded(0, 1000000),
"MajorPageFaults": bounded(0, 10), "MajorPageFaults": bounded(0, 10),
}) })
...@@ -180,10 +180,10 @@ var _ = framework.KubeDescribe("Summary API [NodeConformance]", func() { ...@@ -180,10 +180,10 @@ var _ = framework.KubeDescribe("Summary API [NodeConformance]", func() {
}), }),
"Memory": ptrMatchAllFields(gstruct.Fields{ "Memory": ptrMatchAllFields(gstruct.Fields{
"Time": recent(maxStatsAge), "Time": recent(maxStatsAge),
"AvailableBytes": bounded(1*framework.Kb, 10*framework.Mb), "AvailableBytes": bounded(1*framework.Kb, 80*framework.Mb),
"UsageBytes": bounded(10*framework.Kb, 20*framework.Mb), "UsageBytes": bounded(10*framework.Kb, 80*framework.Mb),
"WorkingSetBytes": bounded(10*framework.Kb, 20*framework.Mb), "WorkingSetBytes": bounded(10*framework.Kb, 80*framework.Mb),
"RSSBytes": bounded(1*framework.Kb, framework.Mb), "RSSBytes": bounded(1*framework.Kb, 80*framework.Mb),
"PageFaults": bounded(100, 1000000), "PageFaults": bounded(100, 1000000),
"MajorPageFaults": bounded(0, 10), "MajorPageFaults": bounded(0, 10),
}), }),
...@@ -227,10 +227,10 @@ var _ = framework.KubeDescribe("Summary API [NodeConformance]", func() { ...@@ -227,10 +227,10 @@ var _ = framework.KubeDescribe("Summary API [NodeConformance]", func() {
}), }),
"Memory": ptrMatchAllFields(gstruct.Fields{ "Memory": ptrMatchAllFields(gstruct.Fields{
"Time": recent(maxStatsAge), "Time": recent(maxStatsAge),
"AvailableBytes": bounded(1*framework.Kb, 10*framework.Mb), "AvailableBytes": bounded(1*framework.Kb, 80*framework.Mb),
"UsageBytes": bounded(10*framework.Kb, 20*framework.Mb), "UsageBytes": bounded(10*framework.Kb, 80*framework.Mb),
"WorkingSetBytes": bounded(10*framework.Kb, 20*framework.Mb), "WorkingSetBytes": bounded(10*framework.Kb, 80*framework.Mb),
"RSSBytes": bounded(1*framework.Kb, framework.Mb), "RSSBytes": bounded(1*framework.Kb, 80*framework.Mb),
"PageFaults": bounded(0, 1000000), "PageFaults": bounded(0, 1000000),
"MajorPageFaults": bounded(0, 10), "MajorPageFaults": bounded(0, 10),
}), }),
...@@ -353,7 +353,7 @@ func getSummaryTestPods(f *framework.Framework, numRestarts int32, names ...stri ...@@ -353,7 +353,7 @@ func getSummaryTestPods(f *framework.Framework, numRestarts int32, names ...stri
Resources: v1.ResourceRequirements{ Resources: v1.ResourceRequirements{
Limits: v1.ResourceList{ Limits: v1.ResourceList{
// Must set memory limit to get MemoryStats.AvailableBytes // Must set memory limit to get MemoryStats.AvailableBytes
v1.ResourceMemory: resource.MustParse("10M"), v1.ResourceMemory: resource.MustParse("80M"),
}, },
}, },
VolumeMounts: []v1.VolumeMount{ VolumeMounts: []v1.VolumeMount{
......
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