Ensure backwards compatibility

Author: PhilippMatthes

api/v1/hypervisor_types.go

@@ -196,9 +196,20 @@ type OperatingSystemStatus struct {
 	GardenLinuxFeatures []string `json:"gardenLinuxFeatures,omitempty"`
 }
 
-// Compute capabilities relevant to check if a VM
-// can be scheduled on the hypervisor.
+// Capabilities of the hypervisor as reported by libvirt.
 type Capabilities struct {
+	// +kubebuilder:default:=unknown
+	// The hosts CPU architecture (not the guests).
+	HostCpuArch string `json:"cpuArch,omitempty"`
+	// Total host memory available as a sum of memory over all numa cells.
+	HostMemory resource.Quantity `json:"memory,omitempty"`
+	// Total host cpus available as a sum of cpus over all numa cells.
+	HostCpus resource.Quantity `json:"cpus,omitempty"`
+}
+
+// Domain capabilities of the hypervisor as reported by libvirt.
+// These details are relevant to check if a VM can be scheduled on the hypervisor.
+type DomainCapabilities struct {
 	// +kubebuilder:default:=unknown
 	// The available domain cpu architecture.
 	Arch string `json:"arch,omitempty"`
@@ -231,9 +242,12 @@ type HypervisorStatus struct {
 	// Represents the Hypervisor hosted Virtual Machines
 	Instances []Instance `json:"instances,omitempty"`
 
-	// Auto-discovered compute capabilities relevant to check if a VM
+	// Auto-discovered capabilities as reported by libvirt.
+	Capabilities Capabilities `json:"capabilities"`
+
+	// Auto-discovered domain capabilities relevant to check if a VM
 	// can be scheduled on the hypervisor.
-	Capabilities Capabilities `json:"capabilities,omitempty"`
+	DomainCapabilities DomainCapabilities `json:"domainCapabilities"`
 
 	// +kubebuilder:default:={}
 	// Auto-discovered capacity available in total on the hypervisor.

api/v1/zz_generated.deepcopy.go

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.19.0
+    controller-gen.kubebuilder.io/version: v0.18.0
   name: hypervisors.kvm.cloud.sap
 spec:
   group: kvm.cloud.sap
@@ -206,38 +206,28 @@ spec:
                   on the hypervisor. Note that this does not include reserved capacity.
                 type: object
               capabilities:
-                description: |-
-                  Auto-discovered compute capabilities relevant to check if a VM
-                  can be scheduled on the hypervisor.
+                description: Auto-discovered capabilities as reported by libvirt.
                 properties:
-                  arch:
+                  cpuArch:
                     default: unknown
-                    description: The available domain cpu architecture.
+                    description: The hosts CPU architecture (not the guests).
                     type: string
-                  hypervisorType:
-                    default: unknown
-                    description: The supported type of virtualization for domains,
-                      such as "ch".
-                    type: string
-                  supportedCpuModes:
-                    default: []
-                    description: Supported cpu modes for domains, such as "host-passthrough".
-                    items:
-                      type: string
-                    type: array
-                  supportedDevices:
-                    default: []
-                    description: Supported devices for domains, such as "video".
-                    items:
-                      type: string
-                    type: array
-                  supportedFeatures:
-                    default: []
-                    description: Supported features for domains, such as "sev" or
-                      "sgx".
-                    items:
-                      type: string
-                    type: array
+                  cpus:
+                    anyOf:
+                    - type: integer
+                    - type: string
+                    description: Total host cpus available as a sum of cpus over all
+                      numa cells.
+                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                    x-kubernetes-int-or-string: true
+                  memory:
+                    anyOf:
+                    - type: integer
+                    - type: string
+                    description: Total host memory available as a sum of memory over
+                      all numa cells.
+                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                    x-kubernetes-int-or-string: true
                 type: object
               capacity:
                 additionalProperties:
@@ -309,6 +299,40 @@ spec:
                   - type
                   type: object
                 type: array
+              domainCapabilities:
+                description: |-
+                  Auto-discovered domain capabilities relevant to check if a VM
+                  can be scheduled on the hypervisor.
+                properties:
+                  arch:
+                    default: unknown
+                    description: The available domain cpu architecture.
+                    type: string
+                  hypervisorType:
+                    default: unknown
+                    description: The supported type of virtualization for domains,
+                      such as "ch".
+                    type: string
+                  supportedCpuModes:
+                    default: []
+                    description: Supported cpu modes for domains, such as "host-passthrough".
+                    items:
+                      type: string
+                    type: array
+                  supportedDevices:
+                    default: []
+                    description: Supported devices for domains, such as "video".
+                    items:
+                      type: string
+                    type: array
+                  supportedFeatures:
+                    default: []
+                    description: Supported features for domains, such as "sev" or
+                      "sgx".
+                    items:
+                      type: string
+                    type: array
+                type: object
               evicted:
                 description: Evicted indicates whether the hypervisor is evicted.
                   (no instances left with active maintenance mode)