mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-07-17 11:28:58 +00:00
Merge pull request #135837 from dgrisonnet/increase-resource-limits
test/e2e: fix pod resize test flakes on CRI-O/runc environments
This commit is contained in:
@@ -90,8 +90,8 @@ func doGuaranteedPodLevelResizeTests(f *framework.Framework) {
|
||||
|
||||
var originalPodResources, desiredPodResources *v1.ResourceRequirements
|
||||
if desiredPodCPU != "" || desiredPodMem != "" {
|
||||
originalPodResources = makePodResources(offsetCPU(15, originalCPU), offsetCPU(15, originalCPU), offsetMemory(15, originalMem), offsetMemory(15, originalMem))
|
||||
desiredPodResources = makePodResources(offsetCPU(15, desiredPodCPU), offsetCPU(15, desiredPodCPU), offsetMemory(15, desiredPodMem), offsetMemory(15, desiredPodMem))
|
||||
originalPodResources = makePodResources(offsetCPU(30, originalCPU), offsetCPU(30, originalCPU), offsetMemory(30, originalMem), offsetMemory(30, originalMem))
|
||||
desiredPodResources = makePodResources(offsetCPU(30, desiredPodCPU), offsetCPU(30, desiredPodCPU), offsetMemory(30, desiredPodMem), offsetMemory(30, desiredPodMem))
|
||||
}
|
||||
|
||||
doPatchAndRollbackPLR(ctx, f, originalContainers, expectedContainers, originalPodResources, desiredPodResources, true, true)
|
||||
|
||||
@@ -51,12 +51,12 @@ const (
|
||||
increasedCPU = "25m"
|
||||
increasedCPULimit = "35m"
|
||||
|
||||
originalMem = "20Mi"
|
||||
originalMemLimit = "30Mi"
|
||||
reducedMem = "15Mi"
|
||||
reducedMemLimit = "25Mi"
|
||||
increasedMem = "25Mi"
|
||||
increasedMemLimit = "35Mi"
|
||||
originalMem = "35Mi"
|
||||
originalMemLimit = "45Mi"
|
||||
reducedMem = "30Mi"
|
||||
reducedMemLimit = "40Mi"
|
||||
increasedMem = "40Mi"
|
||||
increasedMemLimit = "50Mi"
|
||||
)
|
||||
|
||||
func offsetCPU(index int, value string) string {
|
||||
|
||||
Reference in New Issue
Block a user