fix e2e scheduling staticcheck error

This commit is contained in:
tangcong 2020-04-19 16:41:40 +08:00
parent 8b0a7dea1d
commit eab22fd805

View File

@ -1052,15 +1052,19 @@ 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)
framework.ExpectEqual(scheduledCondition.Status, v1.ConditionTrue) if scheduledCondition != nil {
scheduledPods = append(scheduledPods, pod) framework.ExpectEqual(scheduledCondition.Status, v1.ConditionTrue)
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)
framework.ExpectEqual(scheduledCondition.Status, v1.ConditionFalse) if scheduledCondition != nil {
if scheduledCondition.Reason == "Unschedulable" { framework.ExpectEqual(scheduledCondition.Status, v1.ConditionFalse)
if scheduledCondition.Reason == "Unschedulable" {
notScheduledPods = append(notScheduledPods, pod) notScheduledPods = append(notScheduledPods, pod)
}
} }
} }
} }