Aggregates: Stylistic cleanup and fixes

Author: fwiesel

internal/controller/aggregates_controller.go

@@ -143,8 +143,7 @@ func (ac *AggregatesController) determineDesiredState(hv *kvmv1.Hypervisor) ([]s
 	// If onboarding is in progress (Initial or Testing), add test aggregate
 	onboardingCondition := meta.FindStatusCondition(hv.Status.Conditions, kvmv1.ConditionTypeOnboarding)
 	if onboardingCondition != nil && onboardingCondition.Status == metav1.ConditionTrue {
-		if onboardingCondition.Reason == kvmv1.ConditionReasonInitial ||
-			onboardingCondition.Reason == kvmv1.ConditionReasonTesting {
+		if onboardingCondition.Reason == kvmv1.ConditionReasonInitial || onboardingCondition.Reason == kvmv1.ConditionReasonTesting {
 			zone := hv.Labels[corev1.LabelTopologyZone]
 			return []string{zone, testAggregateName}, metav1.Condition{
 				Type:    kvmv1.ConditionTypeAggregatesUpdated,
@@ -154,7 +153,7 @@ func (ac *AggregatesController) determineDesiredState(hv *kvmv1.Hypervisor) ([]s
 			}
 		}
 
-		// If removing test aggregate, use Spec.Aggregates (no test aggregate)
+		// If the onboarding is almost complete, it will wait (among other things) for this controller to switch to Spec.Aggregates
 		if onboardingCondition.Reason == kvmv1.ConditionReasonHandover {
 			return hv.Spec.Aggregates, metav1.Condition{
 				Type:    kvmv1.ConditionTypeAggregatesUpdated,

internal/openstack/aggregates.go

@@ -119,19 +119,19 @@ func ApplyAggregates(ctx context.Context, serviceClient *gophercloud.ServiceClie
 		}
 	}
 
+	if len(errs) > 0 {
+		return nil, errors.Join(errs...)
+	}
+
 	// Collect aggregates with names and UUIDs
 	for _, name := range desiredAggregates {
-		if agg, exists := aggregateMap[name]; exists {
-			result = append(result, kvmv1.Aggregate{
-				Name: agg.Name,
-				UUID: agg.UUID,
-			})
-		}
+		agg := aggregateMap[name] // exists as per "Verify all desired aggregates exist" check
+		result = append(result, kvmv1.Aggregate{
+			Name: agg.Name,
+			UUID: agg.UUID,
+		})
 	}
 
-	if len(errs) > 0 {
-		return nil, errors.Join(errs...)
-	}
 	return result, nil
 }