From 6c6862216b1637c4d3f23f1a297e38bbf96d5eb6 Mon Sep 17 00:00:00 2001 From: Filip Grzadkowski Date: Fri, 13 May 2016 19:00:58 +0200 Subject: [PATCH] Fix updating pod condition in scheduler --- pkg/api/resource_helpers.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkg/api/resource_helpers.go b/pkg/api/resource_helpers.go index 9f71502a61f..1e3b3698b54 100644 --- a/pkg/api/resource_helpers.go +++ b/pkg/api/resource_helpers.go @@ -118,13 +118,16 @@ func UpdatePodCondition(status *PodStatus, condition *PodCondition) bool { if condition.Status == oldCondition.Status { 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 // Return true if one of the fields have changed. - return condition.Status != oldCondition.Status || - condition.Reason != oldCondition.Reason || - condition.Message != oldCondition.Message || - !condition.LastProbeTime.Equal(oldCondition.LastProbeTime) || - !condition.LastTransitionTime.Equal(oldCondition.LastTransitionTime) + return !isEqual } }