From 8b97414f3d3eea4cce7940e446b18f1003d4cd78 Mon Sep 17 00:00:00 2001
From: Joshua Casey <joshuatcasey@gmail.com>
Date: Wed, 7 Aug 2024 10:55:37 -0500
Subject: [PATCH] Refactor to simplify logic

---
 .../controller/conditionsutil/conditions_util.go    | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/internal/controller/conditionsutil/conditions_util.go b/internal/controller/conditionsutil/conditions_util.go
index d21cfa5f7..306a2f5d7 100644
--- a/internal/controller/conditionsutil/conditions_util.go
+++ b/internal/controller/conditionsutil/conditions_util.go
@@ -7,7 +7,7 @@ import (
 	"slices"
 	"sort"
 
-	"k8s.io/apimachinery/pkg/api/equality"
+	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"go.pinniped.dev/internal/plog"
@@ -77,14 +77,9 @@ func mergeCondition(existingConditionsToUpdate *[]metav1.Condition, newCondition
 		newCondition.LastTransitionTime = existingCondition.LastTransitionTime
 	}
 
-	// If anything has actually changed, update the entry and return true.
-	if !equality.Semantic.DeepEqual(existingCondition, newCondition) {
-		*existingCondition = *newCondition
-		return true
-	}
-
-	// Otherwise the entry is already up-to-date.
-	return false
+	changed := !apiequality.Semantic.DeepEqual(existingCondition, newCondition)
+	*existingCondition = *newCondition
+	return changed
 }
 
 func HadErrorCondition(conditions []*metav1.Condition) bool {