Merge pull request #375 from wking/only-bump-lastTransitionTime-on-st…

…atus-changes

OCPBUGS-18034: Only bump lastTransitionTime on 'status' changes

pkg/operator/controller/dns_status.go

@@ -265,8 +265,7 @@ func computeDNSUpgradeableCondition(oldCondition *operatorv1.OperatorCondition,
 // setDNSLastTransitionTime sets LastTransitionTime for the given condition.
 // If the condition has changed, it will assign a new timestamp otherwise keeps the old timestamp.
 func setDNSLastTransitionTime(condition, oldCondition *operatorv1.OperatorCondition) operatorv1.OperatorCondition {
-	if oldCondition != nil && condition.Status == oldCondition.Status &&
-		condition.Reason == oldCondition.Reason && condition.Message == oldCondition.Message {
+	if oldCondition != nil && condition.Status == oldCondition.Status {
 		condition.LastTransitionTime = oldCondition.LastTransitionTime
 	} else {
 		condition.LastTransitionTime = metav1.Now()

pkg/operator/controller/status/controller.go

@@ -625,13 +625,13 @@ func mergeConditions(conditions []configv1.ClusterOperatorStatusCondition, updat
 		for j, cond := range conditions {
 			if cond.Type == update.Type {
 				add = false
-				if conditionChanged(cond, update) {
-					conditions[j].Status = update.Status
-					conditions[j].Reason = update.Reason
-					conditions[j].Message = update.Message
+				if conditions[j].Status != update.Status {
 					conditions[j].LastTransitionTime = now
-					break
 				}
+				conditions[j].Status = update.Status
+				conditions[j].Reason = update.Reason
+				conditions[j].Message = update.Message
+				break
 			}
 		}
 		if add {
@@ -643,10 +643,6 @@ func mergeConditions(conditions []configv1.ClusterOperatorStatusCondition, updat
 	return conditions
 }
 
-func conditionChanged(a, b configv1.ClusterOperatorStatusCondition) bool {
-	return a.Status != b.Status || a.Reason != b.Reason || a.Message != b.Message
-}
-
 // operatorStatusesEqual compares two ClusterOperatorStatus values.  Returns true
 // if the provided ClusterOperatorStatus values should be considered equal for the
 // purpose of determining whether an update is necessary, false otherwise.