Add flags to allow customization of CPU and memory shares, reservations and limits

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

Author: tommasopozzetti

apis/v1alpha3/vspheremachine_conversion.go

@@ -36,6 +36,7 @@ func (src *VSphereMachine) ConvertTo(dstRaw conversion.Hub) error {
 		return err
 	}
 
+	dst.Spec.Resources = restored.Spec.Resources
 	dst.Spec.AdditionalDisksGiB = restored.Spec.AdditionalDisksGiB
 	dst.Spec.TagIDs = restored.Spec.TagIDs
 	dst.Spec.PowerOffMode = restored.Spec.PowerOffMode

apis/v1alpha3/vspheremachinetemplate_conversion.go

@@ -39,6 +39,7 @@ func (src *VSphereMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
 	if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok {
 		return err
 	}
+	dst.Spec.Template.Spec.Resources = restored.Spec.Template.Spec.Resources
 	dst.Spec.Template.Spec.TagIDs = restored.Spec.Template.Spec.TagIDs
 	dst.Spec.Template.Spec.AdditionalDisksGiB = restored.Spec.Template.Spec.AdditionalDisksGiB
 	dst.Spec.Template.Spec.PowerOffMode = restored.Spec.Template.Spec.PowerOffMode

apis/v1alpha3/vspherevm_conversion.go

@@ -35,6 +35,7 @@ func (src *VSphereVM) ConvertTo(dstRaw conversion.Hub) error {
 	if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok {
 		return err
 	}
+	dst.Spec.Resources = restored.Spec.Resources
 	dst.Spec.TagIDs = restored.Spec.TagIDs
 	dst.Spec.AdditionalDisksGiB = restored.Spec.AdditionalDisksGiB
 	dst.Spec.PowerOffMode = restored.Spec.PowerOffMode

apis/v1alpha3/zz_generated.conversion.go

@@ -36,6 +36,7 @@ func (src *VSphereMachine) ConvertTo(dstRaw conversion.Hub) error {
 		return err
 	}
 
+	dst.Spec.Resources = restored.Spec.Resources
 	dst.Spec.AdditionalDisksGiB = restored.Spec.AdditionalDisksGiB
 	dst.Spec.TagIDs = restored.Spec.TagIDs
 	dst.Spec.PowerOffMode = restored.Spec.PowerOffMode

apis/v1alpha4/vspheremachine_conversion.go

@@ -39,6 +39,7 @@ func (src *VSphereMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
 	if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok {
 		return err
 	}
+	dst.Spec.Template.Spec.Resources = restored.Spec.Template.Spec.Resources
 	dst.Spec.Template.Spec.TagIDs = restored.Spec.Template.Spec.TagIDs
 	dst.Spec.Template.Spec.AdditionalDisksGiB = restored.Spec.Template.Spec.AdditionalDisksGiB
 	dst.Spec.Template.Spec.PowerOffMode = restored.Spec.Template.Spec.PowerOffMode

apis/v1alpha4/vspheremachinetemplate_conversion.go

@@ -35,6 +35,7 @@ func (src *VSphereVM) ConvertTo(dstRaw conversion.Hub) error {
 	if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok {
 		return err
 	}
+	dst.Spec.Resources = restored.Spec.Resources
 	dst.Spec.TagIDs = restored.Spec.TagIDs
 	dst.Spec.AdditionalDisksGiB = restored.Spec.AdditionalDisksGiB
 	dst.Spec.PowerOffMode = restored.Spec.PowerOffMode

apis/v1alpha4/vspherevm_conversion.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
 	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 )
 
@@ -167,6 +168,12 @@ type VirtualMachineCloneSpec struct {
 	// virtual machine is cloned.
 	// +optional
 	NumCoresPerSocket int32 `json:"numCoresPerSocket,omitempty"`
+
+	// resources is the definition of the VM's cpu and memory
+	// reservations, limits and shares.
+	// +optional
+	Resources VirtualMachineResources `json:"resources,omitempty,omitzero"`
+
 	// 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.
@@ -211,6 +218,51 @@ type VirtualMachineCloneSpec struct {
 	DataDisks []VSphereDisk `json:"dataDisks,omitempty"`
 }
 
+// VirtualMachineResources is the definition of the VM's cpu and memory
+// reservations, limits and shares.
+// +kubebuilder:validation:MinProperties=1
+type VirtualMachineResources struct {
+	// requests is the definition of the VM's cpu (in hertz, rounded up to the nearest MHz)
+	// and memory (in bytes, rounded up to the nearest MiB) reservations
+	// +optional
+	Requests VirtualMachineResourceSpec `json:"requests,omitempty,omitzero"`
+	// limits is the definition of the VM's cpu (in hertz, rounded up to the nearest MHz)
+	// and memory (in bytes, rounded up to the nearest MiB) limits
+	// +optional
+	Limits VirtualMachineResourceSpec `json:"limits,omitempty,omitzero"`
+	// shares is the definition of the VM's cpu and memory shares
+	// +optional
+	Shares VirtualMachineResourceShares `json:"shares,omitempty,omitzero"`
+}
+
+// VirtualMachineResourceSpec is the numerical definition of memory and cpu quantity for the
+// given VM hardware policy.
+// +kubebuilder:validation:MinProperties=1
+type VirtualMachineResourceSpec struct {
+	// cpu is the definition of the cpu quantity for the given VM hardware policy
+	// +optional
+	Cpu resource.Quantity `json:"cpu,omitempty"` //nolint:revive
+
+	// memory is the definition of the memory quantity for the given VM hardware policy
+	// +optional
+	Memory resource.Quantity `json:"memory,omitempty"`
+}
+
+// VirtualMachineResourceShares is the numerical definition of memory and cpu shares for the
+// given VM
+// +kubebuilder:validation:MinProperties=1
+type VirtualMachineResourceShares struct {
+	// cpu is the number of spu shares to assign to the VM
+	// +kubebuilder:validation:Minimum=1
+	// +optional
+	Cpu int32 `json:"cpu,omitempty"` //nolint:revive
+
+	// memory is the number of memory shares to assign to the VM
+	// +kubebuilder:validation:Minimum=1
+	// +optional
+	Memory int32 `json:"memory,omitempty"`
+}
+
 // VSphereDisk is an additional disk to add to the VM that is not part of the VM OVA template.
 type VSphereDisk struct {
 	// Name is used to identify the disk definition. Name is required and needs to be unique so that it can be used to