Change HypervisorStatus.Aggregates to be name & uuid

This is a breaking change, but shows the clear relationship between
UUIDs and names.

Author: fwiesel

api/v1/hypervisor_types.go

@@ -155,6 +155,15 @@ type Instance struct {
 	Active bool `json:"active"`
 }
 
+// Aggregate represents an OpenStack aggregate with its name and UUID.
+type Aggregate struct {
+	// Name is the name of the aggregate.
+	Name string `json:"name"`
+
+	// UUID is the unique identifier of the aggregate.
+	UUID string `json:"uuid"`
+}
+
 type HyperVisorUpdateStatus struct {
 	// +kubebuilder:default:=false
 	// Represents a running Operating System update.
@@ -351,12 +360,8 @@ type HypervisorStatus struct {
 	// Traits are the applied traits of the hypervisor.
 	Traits []string `json:"traits,omitempty"`
 
-	// Aggregates are the applied aggregates of the hypervisor.
-	Aggregates []string `json:"aggregates,omitempty"`
-
-	// +kubebuilder:default:={}
-	// The UUIDs of the aggregates are used to apply aggregates to the hypervisor.
-	AggregateUUIDs []string `json:"aggregateUUIDs,omitempty"`
+	// Aggregates are the applied aggregates of the hypervisor with their names and UUIDs.
+	Aggregates []Aggregate `json:"aggregates,omitempty"`
 
 	// InternalIP is the internal IP address of the hypervisor.
 	InternalIP string `json:"internalIp,omitempty"`

api/v1/zz_generated.deepcopy.go

@@ -200,17 +200,23 @@ spec:
           status:
             description: HypervisorStatus defines the observed state of Hypervisor
             properties:
-              aggregateUUIDs:
-                default: []
-                description: The UUIDs of the aggregates are used to apply aggregates
-                  to the hypervisor.
-                items:
-                  type: string
-                type: array
               aggregates:
-                description: Aggregates are the applied aggregates of the hypervisor.
+                description: Aggregates are the applied aggregates of the hypervisor
+                  with their names and UUIDs.
                 items:
-                  type: string
+                  description: Aggregate represents an OpenStack aggregate with its
+                    name and UUID.
+                  properties:
+                    name:
+                      description: Name is the name of the aggregate.
+                      type: string
+                    uuid:
+                      description: UUID is the unique identifier of the aggregate.
+                      type: string
+                  required:
+                  - name
+                  - uuid
+                  type: object
                 type: array
               allocation:
                 additionalProperties:

applyconfigurations/api/v1/aggregate.go

@@ -201,17 +201,23 @@ spec:
           status:
             description: HypervisorStatus defines the observed state of Hypervisor
             properties:
-              aggregateUUIDs:
-                default: []
-                description: The UUIDs of the aggregates are used to apply aggregates
-                  to the hypervisor.
-                items:
-                  type: string
-                type: array
               aggregates:
-                description: Aggregates are the applied aggregates of the hypervisor.
+                description: Aggregates are the applied aggregates of the hypervisor
+                  with their names and UUIDs.
                 items:
-                  type: string
+                  description: Aggregate represents an OpenStack aggregate with its
+                    name and UUID.
+                  properties:
+                    name:
+                      description: Name is the name of the aggregate.
+                      type: string
+                    uuid:
+                      description: UUID is the unique identifier of the aggregate.
+                      type: string
+                  required:
+                  - name
+                  - uuid
+                  type: object
                 type: array
               allocation:
                 additionalProperties:

applyconfigurations/api/v1/hypervisorstatus.go

@@ -21,7 +21,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"slices"
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/equality"
@@ -66,11 +65,17 @@ func (ac *AggregatesController) Reconcile(ctx context.Context, req ctrl.Request)
 	}
 
 	base := hv.DeepCopy()
-	desiredAggregates, desiredCondition := ac.determineDesiredState(hv)
+	desiredAggregateNames, desiredCondition := ac.determineDesiredState(hv)
 
-	if !slices.Equal(desiredAggregates, hv.Status.Aggregates) {
+	// Extract current aggregate names for comparison
+	currentAggregateNames := make([]string, len(hv.Status.Aggregates))
+	for i, agg := range hv.Status.Aggregates {
+		currentAggregateNames[i] = agg.Name
+	}
+
+	if !slicesEqualUnordered(desiredAggregateNames, currentAggregateNames) {
 		// Apply aggregates to OpenStack and update status
-		uuids, err := openstack.ApplyAggregates(ctx, ac.computeClient, hv.Name, desiredAggregates)
+		aggregates, err := openstack.ApplyAggregates(ctx, ac.computeClient, hv.Name, desiredAggregateNames)
 		if err != nil {
 			// Set error condition
 			condition := metav1.Condition{
@@ -89,8 +94,7 @@ func (ac *AggregatesController) Reconcile(ctx context.Context, req ctrl.Request)
 			return ctrl.Result{}, err
 		}
 
-		hv.Status.Aggregates = desiredAggregates
-		hv.Status.AggregateUUIDs = uuids
+		hv.Status.Aggregates = aggregates
 	}
 
 	// Set the condition based on the determined desired state
@@ -123,8 +127,12 @@ func (ac *AggregatesController) determineDesiredState(hv *kvmv1.Hypervisor) ([]s
 				Message: "Aggregates cleared due to termination after eviction",
 			}
 		}
-		// Still evicting or eviction not started - keep current aggregates
-		return hv.Status.Aggregates, metav1.Condition{
+		// Still evicting or eviction not started - keep current aggregate names
+		currentAggregateNames := make([]string, len(hv.Status.Aggregates))
+		for i, agg := range hv.Status.Aggregates {
+			currentAggregateNames[i] = agg.Name
+		}
+		return currentAggregateNames, metav1.Condition{
 			Type:    kvmv1.ConditionTypeAggregatesUpdated,
 			Status:  metav1.ConditionFalse,
 			Reason:  kvmv1.ConditionReasonEvictionInProgress,
@@ -166,6 +174,30 @@ func (ac *AggregatesController) determineDesiredState(hv *kvmv1.Hypervisor) ([]s
 	}
 }
 
+// slicesEqualUnordered compares two string slices without considering order.
+// Returns true if both slices contain the same elements, regardless of order.
+func slicesEqualUnordered(a, b []string) bool {
+	if len(a) != len(b) {
+		return false
+	}
+
+	// Create a map to count occurrences in slice a
+	counts := make(map[string]int)
+	for _, s := range a {
+		counts[s]++
+	}
+
+	// Verify all elements in b exist in a with correct counts
+	for _, s := range b {
+		counts[s]--
+		if counts[s] < 0 {
+			return false
+		}
+	}
+
+	return true
+}
+
 // SetupWithManager sets up the controller with the Manager.
 func (ac *AggregatesController) SetupWithManager(mgr ctrl.Manager) error {
 	ctx := context.Background()