github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #92545 from hasheddan/scheduling-part-two

Browse Source 
Do not ignore unscheduled pods when NodeName not in set of worker nodes
This commit is contained in:
Kubernetes Prow Robot 2020-06-27 19:02:13 -07:00 committed by GitHub
commit 18db08b813
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
test/e2e/scheduling/predicates.go
View File

@ -1045,23 +1045,20 @@ func translateIPv4ToIPv6(ip string) string {
// GetPodsScheduled returns a number of currently scheduled and not scheduled Pods on worker nodes. // GetPodsScheduled returns a number of currently scheduled and not scheduled Pods on worker nodes.
func GetPodsScheduled(workerNodes sets.String, pods *v1.PodList) (scheduledPods, notScheduledPods []v1.Pod) { func GetPodsScheduled(workerNodes sets.String, pods *v1.PodList) (scheduledPods, notScheduledPods []v1.Pod) {
for _, pod := range pods.Items { for _, pod := range pods.Items {
if workerNodes.Has(pod.Spec.NodeName) { if pod.Spec.NodeName != "" && workerNodes.Has(pod.Spec.NodeName) {
if pod.Spec.NodeName != "" { _, scheduledCondition := podutil.GetPodCondition(&pod.Status, v1.PodScheduled)
_, scheduledCondition := podutil.GetPodCondition(&pod.Status, v1.PodScheduled) framework.ExpectEqual(scheduledCondition != nil, true)
framework.ExpectEqual(scheduledCondition != nil, true) if scheduledCondition != nil {
if scheduledCondition != nil { framework.ExpectEqual(scheduledCondition.Status, v1.ConditionTrue)
framework.ExpectEqual(scheduledCondition.Status, v1.ConditionTrue) scheduledPods = append(scheduledPods, pod)
scheduledPods = append(scheduledPods, pod) }
} } else {
} else { _, scheduledCondition := podutil.GetPodCondition(&pod.Status, v1.PodScheduled)
_, scheduledCondition := podutil.GetPodCondition(&pod.Status, v1.PodScheduled) framework.ExpectEqual(scheduledCondition != nil, true)
framework.ExpectEqual(scheduledCondition != nil, true) if scheduledCondition != nil {
if scheduledCondition != nil { framework.ExpectEqual(scheduledCondition.Status, v1.ConditionFalse)
framework.ExpectEqual(scheduledCondition.Status, v1.ConditionFalse) if scheduledCondition.Reason == "Unschedulable" {
if scheduledCondition.Reason == "Unschedulable" { notScheduledPods = append(notScheduledPods, pod)
notScheduledPods = append(notScheduledPods, pod)
}
} }
} }
} }