Merge pull request kubernetes#92603 from hasheddan/schedule-part-three

k8s-ci-robot · web-flow · commit 9fb637152ca5 · 2020-06-29T18:35:36.000-07:00
Do not raise exception if unscheduled Pod status is unknown
diff --git a/test/e2e/scheduling/predicates.go b/test/e2e/scheduling/predicates.go
@@ -1052,15 +1052,8 @@ func GetPodsScheduled(workerNodes sets.String, pods *v1.PodList) (scheduledPods,
 				framework.ExpectEqual(scheduledCondition.Status, v1.ConditionTrue)
 				scheduledPods = append(scheduledPods, pod)
 			}
-		} else {
-			_, scheduledCondition := podutil.GetPodCondition(&pod.Status, v1.PodScheduled)
-			framework.ExpectEqual(scheduledCondition != nil, true)
-			if scheduledCondition != nil {
-				framework.ExpectEqual(scheduledCondition.Status, v1.ConditionFalse)
-				if scheduledCondition.Reason == "Unschedulable" {
-					notScheduledPods = append(notScheduledPods, pod)
-				}
-			}
+		} else if pod.Spec.NodeName == "" {
+			notScheduledPods = append(notScheduledPods, pod)
 		}
 	}
 	return

Original file line number	Diff line number	Diff line change
`@@ -1052,15 +1052,8 @@ func GetPodsScheduled(workerNodes sets.String, pods *v1.PodList) (scheduledPods,`
`1052`	`1052`	`framework.ExpectEqual(scheduledCondition.Status, v1.ConditionTrue)`
`1053`	`1053`	`scheduledPods = append(scheduledPods, pod)`
`1054`	`1054`	`}`
`1055`		`- } else {`
`1056`		`- _, scheduledCondition := podutil.GetPodCondition(&pod.Status, v1.PodScheduled)`
`1057`		`- framework.ExpectEqual(scheduledCondition != nil, true)`
`1058`		`- if scheduledCondition != nil {`
`1059`		`- framework.ExpectEqual(scheduledCondition.Status, v1.ConditionFalse)`
`1060`		`- if scheduledCondition.Reason == "Unschedulable" {`
`1061`		`- notScheduledPods = append(notScheduledPods, pod)`
`1062`		`- }`
`1063`		`- }`
	`1055`	`+ } else if pod.Spec.NodeName == "" {`
	`1056`	`+ notScheduledPods = append(notScheduledPods, pod)`
`1064`	`1057`	`}`
`1065`	`1058`	`}`
`1066`	`1059`	`return`