From d6b45bc98d9483da01afe69dddd681df29f3f7ab Mon Sep 17 00:00:00 2001 From: Sotiris Salloumis Date: Fri, 28 Mar 2025 14:30:50 +0100 Subject: [PATCH] [FG:InPlacePodVerticalScaling] clean code resize test - Improve information when VerifyPodContainersCgroupValues fails - Use common way to append errors --- .../common/node/framework/podresize/resize.go | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/test/e2e/common/node/framework/podresize/resize.go b/test/e2e/common/node/framework/podresize/resize.go index 954d474ab2a..7ada40922fc 100644 --- a/test/e2e/common/node/framework/podresize/resize.go +++ b/test/e2e/common/node/framework/podresize/resize.go @@ -345,10 +345,19 @@ func VerifyPodContainersCgroupValues(ctx context.Context, f *framework.Framework } if expectedMemLimitString != "0" { - errs = append(errs, e2epod.VerifyCgroupValue(f, pod, ci.Name, cgroupMemLimit, expectedMemLimitString)) + if err := e2epod.VerifyCgroupValue(f, pod, ci.Name, cgroupMemLimit, expectedMemLimitString); err != nil { + errs = append(errs, fmt.Errorf("failed to verify memory limit cgroup value: %w", err)) + } } - errs = append(errs, e2epod.VerifyCgroupValue(f, pod, ci.Name, cgroupCPULimit, expectedCPULimits...)) - errs = append(errs, e2epod.VerifyCgroupValue(f, pod, ci.Name, cgroupCPURequest, strconv.FormatInt(expectedCPUShares, 10))) + + if err := e2epod.VerifyCgroupValue(f, pod, ci.Name, cgroupCPULimit, expectedCPULimits...); err != nil { + errs = append(errs, fmt.Errorf("failed to verify cpu limit cgroup value: %w", err)) + } + + if err := e2epod.VerifyCgroupValue(f, pod, ci.Name, cgroupCPURequest, strconv.FormatInt(expectedCPUShares, 10)); err != nil { + errs = append(errs, fmt.Errorf("failed to verify cpu request cgroup value: %w", err)) + } + // TODO(vinaykul,InPlacePodVerticalScaling): Verify oom_score_adj when runc adds support for updating it // See https://github.com/opencontainers/runc/pull/4669 } @@ -384,8 +393,7 @@ func verifyContainerRestarts(f *framework.Framework, pod *v1.Pod, gotStatuses [] if gotStatus.RestartCount != wantStatuses[i].RestartCount { errs = append(errs, fmt.Errorf("unexpected number of restarts for container %s: got %d, want %d", gotStatus.Name, gotStatus.RestartCount, wantStatuses[i].RestartCount)) } else if gotStatus.RestartCount > 0 { - err := verifyOomScoreAdj(f, pod, gotStatus.Name) - if err != nil { + if err := verifyOomScoreAdj(f, pod, gotStatus.Name); err != nil { errs = append(errs, err) } }