Minor fixes

Azure · Jan 18, 2025 · 4540d2f · 4540d2f
1 parent 0d057e7
commit 4540d2f
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/pkg/controllers/clusterresourceplacement/placement_status.go b/pkg/controllers/clusterresourceplacement/placement_status.go
@@ -146,6 +146,12 @@ func (r *Reconciler) setScheduledResourcePlacementStatuses(
 		clusterDecision := selected[idx]
 		rps := &fleetv1beta1.ResourcePlacementStatus{}
 
+		// Port back the old conditions.
+		// This is necessary for Fleet to track the last transition times correctly.
+		if oldConds, ok := oldRPSMap[clusterDecision.ClusterName]; ok {
+			rps.Conditions = oldConds
+		}
+
 		// Set the scheduled condition.
 		scheduledCondition := metav1.Condition{
 			Status:             metav1.ConditionTrue,
@@ -159,12 +165,6 @@ func (r *Reconciler) setScheduledResourcePlacementStatuses(
 		// Set the cluster name.
 		rps.ClusterName = clusterDecision.ClusterName
 
-		// Port back the old conditions.
-		// This is necessary for Fleet to track the last transition times correctly.
-		if oldConds, ok := oldRPSMap[clusterDecision.ClusterName]; ok {
-			rps.Conditions = oldConds
-		}
-
 		// Prepare the new conditions.
 		binding := bindingMap[clusterDecision.ClusterName]
 		setStatusByCondType, err := r.setResourcePlacementStatusPerCluster(crp, latestClusterResourceSnapshot, binding, rps, expectedCondTypes)