github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #90313 from tangcong/fix-scheduler-static-checkerr

Browse Source 
fix e2e scheduling staticcheck error
This commit is contained in:
Kubernetes Prow Robot 2020-04-23 23:30:20 -07:00 committed by GitHub
commit f7b9960767
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1052,11 +1052,14 @@ func GetPodsScheduled(masterNodes sets.String, pods *v1.PodList) (scheduledPods,
if 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 {
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 {
framework.ExpectEqual(scheduledCondition.Status, v1.ConditionFalse) framework.ExpectEqual(scheduledCondition.Status, v1.ConditionFalse)
if scheduledCondition.Reason == "Unschedulable" { if scheduledCondition.Reason == "Unschedulable" {
@ -1065,5 +1068,6 @@ func GetPodsScheduled(masterNodes sets.String, pods *v1.PodList) (scheduledPods,
} }
} }
} }
}
return return
} }