github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-16 15:20:17 +00:00
Code Issues Projects Releases Wiki Activity

Small clean and comment rewording of WaitForPodsRunningReady

Browse Source
This commit is contained in:
Matt Karrmann 2024-04-16 22:43:09 -05:00
parent 3476833367
commit 62b9e832cc
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/e2e/framework/pod/wait.go
View File

@ -226,7 +226,7 @@ func WaitForAlmostAllPodsReady(ctx context.Context, c clientset.Interface, ns st
// WaitForPodsRunningReady waits up to timeout for the following conditions: // WaitForPodsRunningReady waits up to timeout for the following conditions:
// 1. At least minPods Pods in Namespace ns are Running and Ready // 1. At least minPods Pods in Namespace ns are Running and Ready
// 2. No Pods in Namespace ns are not either Ready, Succeeded, or Failed with a Controller // 2. No Pods in Namespace ns are Failed and not owned by a controller or Pending
// //
// An error is returned if either of these conditions are not met within the timeout. // An error is returned if either of these conditions are not met within the timeout.
// //
@ -236,11 +236,6 @@ func WaitForAlmostAllPodsReady(ctx context.Context, c clientset.Interface, ns st
// waiting. All pods that are in SUCCESS state are not counted. // waiting. All pods that are in SUCCESS state are not counted.
func WaitForPodsRunningReady(ctx context.Context, c clientset.Interface, ns string, minPods int, timeout time.Duration) error { func WaitForPodsRunningReady(ctx context.Context, c clientset.Interface, ns string, minPods int, timeout time.Duration) error {
nOk := 0
badPods := []v1.Pod{}
otherPods := []v1.Pod{}
succeededPods := []string{}
return framework.Gomega().Eventually(ctx, framework.HandleRetry(func(ctx context.Context) ([]v1.Pod, error) { return framework.Gomega().Eventually(ctx, framework.HandleRetry(func(ctx context.Context) ([]v1.Pod, error) {
podList, err := c.CoreV1().Pods(ns).List(ctx, metav1.ListOptions{}) podList, err := c.CoreV1().Pods(ns).List(ctx, metav1.ListOptions{})
@ -250,10 +245,11 @@ func WaitForPodsRunningReady(ctx context.Context, c clientset.Interface, ns stri
return podList.Items, nil return podList.Items, nil
})).WithTimeout(timeout).Should(framework.MakeMatcher(func(pods []v1.Pod) (func() string, error) { })).WithTimeout(timeout).Should(framework.MakeMatcher(func(pods []v1.Pod) (func() string, error) {
nOk = 0 nOk := 0
badPods = []v1.Pod{} badPods := []v1.Pod{}
otherPods = []v1.Pod{} otherPods := []v1.Pod{}
succeededPods = []string{} succeededPods := []string{}
for _, pod := range pods { for _, pod := range pods {
res, err := testutils.PodRunningReady(&pod) res, err := testutils.PodRunningReady(&pod)
switch { switch {
@ -271,7 +267,7 @@ func WaitForPodsRunningReady(ctx context.Context, c clientset.Interface, ns stri
otherPods = append(otherPods, pod) otherPods = append(otherPods, pod)
} }
} }
if nOk >= minPods && len(badPods)+len(otherPods) <= 0 { if nOk >= minPods && len(badPods)+len(otherPods) == 0 {
return nil, nil return nil, nil
} }