github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-17 02:06:23 +00:00
Code Issues Projects Releases Wiki Activity

test fixes

Browse Source
This commit is contained in:
ndixita
2026-03-19 21:21:39 +00:00
parent 3b19886847
commit ec6d65e333
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/common/node/framework/podresize/resize.go
View File

@@ -383,11 +383,6 @@ func WaitForPodResizeActuation(ctx context.Context, f *framework.Framework, podC
}, nil
}
if resourceErrs := VerifyPodStatusResources(pod, expectedContainers); resourceErrs != nil {
return func() string {
return fmt.Sprintf("container status resources don't match expected: %v", formatErrors(resourceErrs))
}, nil
}
// Wait for kubelet to clear the resize status conditions.
for _, c := range pod.Status.Conditions {
if c.Type == v1.PodResizePending || c.Type == v1.PodResizeInProgress {

5
test/e2e/common/node/pod_level_resources_resize.go
View File

@@ -27,7 +27,6 @@ import (
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
utilerrors "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/kubernetes/pkg/features"
@@ -72,7 +71,9 @@ func doGuaranteedPodLevelResizeTests(f *framework.Framework) {
expectedContainers := makeGuaranteedContainers(1, cpuPolicy, memPolicy, true, true, desiredCtrCPU, desiredCtrMem)
for i, c := range expectedContainers {
// If the pod has init containers, but we are not resizing them, keep the original resources.
if c.InitCtr && !resizeInitCtrs {
podLevelOnly := (desiredCtrCPU == "" && desiredPodCPU != originalCPU) || (desiredCtrMem == "" && desiredPodMem != originalMem)
if c.InitCtr && !resizeInitCtrs && !podLevelOnly {
c.Resources = originalContainers[i].Resources
expectedContainers[i] = c
continue