Store Aggregate UUIDs in the hypervisor status

For Cortex, we want the uuids in addition to the names, so
keep track of them in the status.

Author: fwiesel

api/v1/hypervisor_types.go

@@ -341,6 +341,10 @@ type HypervisorStatus struct {
 	// 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"`
+
 	// InternalIP is the internal IP address of the hypervisor.
 	InternalIP string `json:"internalIp,omitempty"`
 

api/v1/zz_generated.deepcopy.go

@@ -188,6 +188,13 @@ 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.
                 items:

applyconfigurations/api/v1/hypervisorstatus.go

@@ -189,6 +189,13 @@ 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.
                 items:

charts/openstack-hypervisor-operator/crds/hypervisor-crd.yaml

@@ -50,13 +50,15 @@ var _ = Describe("AggregatesController", func() {
 			"availability_zone": "",
 			"deleted": false,
 			"id": 100001,
+			"uuid": "uuid-100001",
 			"hosts": ["hv-test"]
 		},
 		{
 			"name": "test-aggregate3",
 			"availability_zone": "",
 			"deleted": false,
 			"id": 99,
+			"uuid": "uuid-99",
 			"hosts": ["hv-test"]
 		}
     ]
@@ -69,7 +71,8 @@ var _ = Describe("AggregatesController", func() {
 			"name": "test-aggregate3",
 			"availability_zone": "",
 			"deleted": false,
-			"id": 99
+			"id": 99,
+			"uuid": "uuid-99"
 		}
 }`
 
@@ -82,7 +85,8 @@ var _ = Describe("AggregatesController", func() {
             "hosts": [
                 "hv-test"
             ],
-            "id": 42
+            "id": 42,
+            "uuid": "uuid-42"
         }
 }`
 	)
@@ -159,6 +163,7 @@ var _ = Describe("AggregatesController", func() {
 							"availability_zone": "",
 							"deleted": false,
 							"id": 42,
+							"uuid": "uuid-42",
 							"hosts": []
 						}
 					]
@@ -190,6 +195,7 @@ var _ = Describe("AggregatesController", func() {
 				updated := &kvmv1.Hypervisor{}
 				Expect(aggregatesController.Client.Get(ctx, hypervisorName, updated)).To(Succeed())
 				Expect(updated.Status.Aggregates).To(ContainElements("test-aggregate1"))
+				Expect(updated.Status.AggregateUUIDs).To(ContainElements("uuid-42"))
 				Expect(meta.IsStatusConditionTrue(updated.Status.Conditions, kvmv1.ConditionTypeAggregatesUpdated)).To(BeTrue())
 			})
 		})
@@ -232,6 +238,7 @@ var _ = Describe("AggregatesController", func() {
 				updated := &kvmv1.Hypervisor{}
 				Expect(aggregatesController.Client.Get(ctx, hypervisorName, updated)).To(Succeed())
 				Expect(updated.Status.Aggregates).To(BeEmpty())
+				Expect(updated.Status.AggregateUUIDs).To(BeEmpty())
 				Expect(meta.IsStatusConditionTrue(updated.Status.Conditions, kvmv1.ConditionTypeAggregatesUpdated)).To(BeTrue())
 			})
 		})

config/crd/bases/kvm.cloud.sap_hypervisors.yaml

@@ -166,11 +166,13 @@ func ApplyAggregatesAndUpdateStatus(
 	// Remove condition before OpenStack call to reflect unknown state on failure
 	meta.RemoveStatusCondition(&hv.Status.Conditions, kvmv1.ConditionTypeAggregatesUpdated)
 
-	if _, err := openstack.ApplyAggregates(ctx, computeClient, hv.Name, desiredAggregates); err != nil {
+	uuids, err := openstack.ApplyAggregates(ctx, computeClient, hv.Name, desiredAggregates)
+	if err != nil {
 		return fmt.Errorf("failed to apply aggregates: %w", err)
 	}
 
 	hv.Status.Aggregates = desiredAggregates
+	hv.Status.AggregateUUIDs = uuids
 
 	return nil
 }