Merge pull request kubernetes#131090 from natasha41575/deflakeCgroupNotFound

k8s-ci-robot · web-flow · commit bdda0a530ed2 · 2025-03-28T00:54:34.000-07:00
[FG:InPlacePodVerticalScaling] deflake - wait for containers to have started before doing cgroup check
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"
@@ -438,6 +439,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"`
`@@ -438,6 +439,10 @@ func WaitForPodResizeActuation(ctx context.Context, f *framework.Framework, podC`
`438`	`439`	`}, nil`
`439`	`440`	`}`
`440`	`441`	`}`
	`442`	`+ // Wait for the pod to be ready.`
	`443`	`+ if !podutils.IsPodReady(pod) {`
	`444`	`+ return func() string { return "pod is not ready" }, nil`
	`445`	`+ }`
`441`	`446`	`return nil, nil`
`442`	`447`	`})),`
`443`	`448`	`)`