Add flags to allow customization of CPU shares and reservations

for each cloned VM

Signed-off-by: Tommaso <[email protected]>

Author: tommasopozzetti

apis/v1alpha3/zz_generated.conversion.go

@@ -167,6 +167,16 @@ type VirtualMachineCloneSpec struct {
 	// virtual machine is cloned.
 	// +optional
 	NumCoresPerSocket int32 `json:"numCoresPerSocket,omitempty"`
+	// CPUReservationMhz is the amount of CPU in MHz that is guaranteed available to the virtual machine.
+	// Defaults to the eponymous property value in the template from which the
+	// virtual machine is cloned.
+	// +optional
+	CPUReservationMhz int64 `json:"cpuReservationMhz,omitempty"`
+	// CPUShares are a relative priority to other virtual machines used in case of resource contention.
+	// Defaults to the eponymous property value in the template from which the
+	// virtual machine is cloned.
+	// +optional
+	CPUShares int32 `json:"cpuShares,omitempty"`
 	// MemoryMiB is the size of a virtual machine's memory, in MiB.
 	// Defaults to the eponymous property value in the template from which the
 	// virtual machine is cloned.

apis/v1alpha4/zz_generated.conversion.go

@@ -967,6 +967,20 @@ spec:
                   Defaults to LinkedClone, but fails gracefully to FullClone if the source
                   of the clone operation has no snapshots.
                 type: string
+              cpuReservationMhz:
+                description: |-
+                  CPUReservationMhz is the amount of CPU in MHz that is guaranteed available to the virtual machine.
+                  Defaults to the eponymous property value in the template from which the
+                  virtual machine is cloned.
+                format: int64
+                type: integer
+              cpuShares:
+                description: |-
+                  CPUShares are a relative priority to other virtual machines used in case of resource contention.
+                  Defaults to the eponymous property value in the template from which the
+                  virtual machine is cloned.
+                format: int32
+                type: integer
               customVMXKeys:
                 additionalProperties:
                   type: string

apis/v1beta1/types.go

@@ -837,6 +837,20 @@ spec:
                           Defaults to LinkedClone, but fails gracefully to FullClone if the source
                           of the clone operation has no snapshots.
                         type: string
+                      cpuReservationMhz:
+                        description: |-
+                          CPUReservationMhz is the amount of CPU in MHz that is guaranteed available to the virtual machine.
+                          Defaults to the eponymous property value in the template from which the
+                          virtual machine is cloned.
+                        format: int64
+                        type: integer
+                      cpuShares:
+                        description: |-
+                          CPUShares are a relative priority to other virtual machines used in case of resource contention.
+                          Defaults to the eponymous property value in the template from which the
+                          virtual machine is cloned.
+                        format: int32
+                        type: integer
                       customVMXKeys:
                         additionalProperties:
                           type: string

config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachines.yaml

@@ -1057,6 +1057,20 @@ spec:
                   Defaults to LinkedClone, but fails gracefully to FullClone if the source
                   of the clone operation has no snapshots.
                 type: string
+              cpuReservationMhz:
+                description: |-
+                  CPUReservationMhz is the amount of CPU in MHz that is guaranteed available to the virtual machine.
+                  Defaults to the eponymous property value in the template from which the
+                  virtual machine is cloned.
+                format: int64
+                type: integer
+              cpuShares:
+                description: |-
+                  CPUShares are a relative priority to other virtual machines used in case of resource contention.
+                  Defaults to the eponymous property value in the template from which the
+                  virtual machine is cloned.
+                format: int32
+                type: integer
               customVMXKeys:
                 additionalProperties:
                   type: string

config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachinetemplates.yaml

@@ -212,6 +212,20 @@ func Clone(ctx context.Context, vmCtx *capvcontext.VMContext, bootstrapData []by
 		Snapshot: snapshotRef,
 	}
 
+	// Set CPU reservation and shares if specified
+	cpuAllocation := types.ResourceAllocationInfo{}
+	if vmCtx.VSphereVM.Spec.CPUReservationMhz > 0 {
+		cpuAllocation.Reservation = ptr.To(vmCtx.VSphereVM.Spec.CPUReservationMhz)
+	}
+	if vmCtx.VSphereVM.Spec.CPUShares > 0 {
+		cpuShares := types.SharesInfo{
+			Shares: vmCtx.VSphereVM.Spec.CPUShares,
+			Level:  types.SharesLevelCustom,
+		}
+		cpuAllocation.Shares = ptr.To(cpuShares)
+	}
+	spec.Config.CpuAllocation = ptr.To(cpuAllocation)
+
 	// For PCI devices, the memory for the VM needs to be reserved
 	// We can replace this once we have another way of reserving memory option
 	// exposed via the API types.