Commit 11697432 authored by Jeff Lowdermilk's avatar Jeff Lowdermilk

Merge pull request #25575 from fgrzadkowski/unschedulable_pod

Fix updating pod condition in scheduler
parents 177c0efe 6c686221
...@@ -118,13 +118,16 @@ func UpdatePodCondition(status *PodStatus, condition *PodCondition) bool { ...@@ -118,13 +118,16 @@ func UpdatePodCondition(status *PodStatus, condition *PodCondition) bool {
if condition.Status == oldCondition.Status { if condition.Status == oldCondition.Status {
condition.LastTransitionTime = oldCondition.LastTransitionTime condition.LastTransitionTime = oldCondition.LastTransitionTime
} }
isEqual := condition.Status == oldCondition.Status &&
condition.Reason == oldCondition.Reason &&
condition.Message == oldCondition.Message &&
condition.LastProbeTime.Equal(oldCondition.LastProbeTime) &&
condition.LastTransitionTime.Equal(oldCondition.LastTransitionTime)
status.Conditions[conditionIndex] = *condition status.Conditions[conditionIndex] = *condition
// Return true if one of the fields have changed. // Return true if one of the fields have changed.
return condition.Status != oldCondition.Status || return !isEqual
condition.Reason != oldCondition.Reason ||
condition.Message != oldCondition.Message ||
!condition.LastProbeTime.Equal(oldCondition.LastProbeTime) ||
!condition.LastTransitionTime.Equal(oldCondition.LastTransitionTime)
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment