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

Merge pull request #25575 from fgrzadkowski/unschedulable_pod

Browse Source 
Fix updating pod condition in scheduler
This commit is contained in:
Jeff Lowdermilk 2016-05-13 15:05:19 -07:00
commit 1169743223
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/api/resource_helpers.go
View File

@ -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)
} }
} }