wait for containers to have started before doing cgroup check

natasha41575 · natasha41575 · commit d349ac57e474 · 2025-03-27T20:52:44.000Z
diff --git a/test/e2e/framework/pod/resize.go b/test/e2e/framework/pod/resize.go
@@ -29,6 +29,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	helpers "k8s.io/component-helpers/resource"
+	"k8s.io/kubectl/pkg/util/podutils"
 	kubecm "k8s.io/kubernetes/pkg/kubelet/cm"
 	kubeqos "k8s.io/kubernetes/pkg/kubelet/qos"
 	"k8s.io/kubernetes/test/e2e/framework"
@@ -444,6 +445,10 @@ func WaitForPodResizeActuation(ctx context.Context, f *framework.Framework, podC
 					}, nil
 				}
 			}
+			// Wait for the pod to be ready.
+			if !podutils.IsPodReady(pod) {
+				return func() string { return "pod is not ready" }, nil
+			}
 			return nil, nil
 		})),
 	)

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ import (`
`29`	`29`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`30`	`30`	`utilerrors "k8s.io/apimachinery/pkg/util/errors"`
`31`	`31`	`helpers "k8s.io/component-helpers/resource"`
	`32`	`+ "k8s.io/kubectl/pkg/util/podutils"`
`32`	`33`	`kubecm "k8s.io/kubernetes/pkg/kubelet/cm"`
`33`	`34`	`kubeqos "k8s.io/kubernetes/pkg/kubelet/qos"`
`34`	`35`	`"k8s.io/kubernetes/test/e2e/framework"`
`@@ -444,6 +445,10 @@ func WaitForPodResizeActuation(ctx context.Context, f *framework.Framework, podC`
`444`	`445`	`}, nil`
`445`	`446`	`}`
`446`	`447`	`}`
	`448`	`+ // Wait for the pod to be ready.`
	`449`	`+ if !podutils.IsPodReady(pod) {`
	`450`	`+ return func() string { return "pod is not ready" }, nil`
	`451`	`+ }`
`447`	`452`	`return nil, nil`
`448`	`453`	`})),`
`449`	`454`	`)`