add cpu/memory option to proxmoxmachine spec

Author: sp-yduck

api/v1beta1/proxmoxmachine_types.go

@@ -46,6 +46,9 @@ type ProxmoxMachineSpec struct {
 	// +optional
 	CloudInit CloudInit `json:"cloudInit,omitempty"`
 
+	// Hardware
+	Hardware Hardware `json:"hardware,omitempty"`
+
 	// Network
 	Network Network `json:"network,omitempty"`
 

api/v1beta1/type.go

@@ -30,6 +30,19 @@ type ObjectReference struct {
 // 	ChecksumType *string `json:"checksumType,omitempty"`
 // }
 
+// Hardware
+type Hardware struct {
+	// number of CPU cores : 1 ~
+	// +kubebuilder:validation:Mimimum:=1
+	// +kubebuilder:default:=2
+	CPU int `json:"cpu,omitempty"`
+
+	// amount of RAM for the VM in MiB : 16 ~
+	// +kubebuilder:validation:Minimum:=16
+	// +kubebuilder:default:=4096
+	Memory int `json:"memoty,omitempty"`
+}
+
 // Network
 // cloud-init network configuration is configured through Proxmox API
 // it may be migrated to raw yaml way from Proxmox API way in the future
@@ -71,7 +84,7 @@ func (i *IPConfig) String() string {
 
 // Storage for image and snippets
 type Storage struct {
-	Name string `json:"name"`
+	Name string `json:"name,omitempty"`
 	Path string `json:"path,omitempty"`
 }
 

api/v1beta1/zz_generated.deepcopy.go

@@ -61,6 +61,7 @@ type MachineGetter interface {
 	GetStorage() infrav1.Storage
 	GetCloudInit() infrav1.CloudInit
 	GetNetwork() infrav1.Network
+	GetHardware() infrav1.Hardware
 }
 
 // MachineSetter is an interface which can set machine information.

cloud/interfaces.go

@@ -159,6 +159,17 @@ func (m *MachineScope) GetNetwork() infrav1.Network {
 	return m.ProxmoxMachine.Spec.Network
 }
 
+func (m *MachineScope) GetHardware() infrav1.Hardware {
+	// set default value if empty
+	if m.ProxmoxMachine.Spec.Hardware.CPU == 0 {
+		m.ProxmoxMachine.Spec.Hardware.CPU = 2
+	}
+	if m.ProxmoxMachine.Spec.Hardware.Memory == 0 {
+		m.ProxmoxMachine.Spec.Hardware.Memory = 4096
+	}
+	return m.ProxmoxMachine.Spec.Hardware
+}
+
 // SetProviderID sets the ProxmoxMachine providerID in spec.
 func (m *MachineScope) SetProviderID(instance *vm.VirtualMachine) error {
 	providerid, err := providerid.New(instance.Node.Name(), instance.VMID)

cloud/scope/machine.go

@@ -114,7 +114,7 @@ func (s *Service) CreateInstance(ctx context.Context, bootstrap string) (*vm.Vir
 	}
 
 	// create vm
-	vmoption := generateVMOptions(s.scope.Name(), s.scope.GetStorage().Name, s.scope.GetNetwork())
+	vmoption := generateVMOptions(s.scope.Name(), s.scope.GetStorage().Name, s.scope.GetNetwork(), s.scope.GetHardware())
 	vm, err := node.CreateVirtualMachine(vmid, vmoption)
 	if err != nil {
 		log.Error(err, "failed to create virtual machine")
@@ -210,12 +210,11 @@ func SetCloudImage(ctx context.Context, vmid int, storageName string, ssh scope.
 	return nil
 }
 
-func generateVMOptions(vmName, storageName string, network infrav1.Network) vm.VirtualMachineCreateOptions {
-
+func generateVMOptions(vmName, storageName string, network infrav1.Network, hardware infrav1.Hardware) vm.VirtualMachineCreateOptions {
 	vmoptions := vm.VirtualMachineCreateOptions{
 		Agent:        "enabled=1",
-		Cores:        2,
-		Memory:       1024 * 4,
+		Cores:        hardware.CPU,
+		Memory:       hardware.Memory,
 		Name:         vmName,
 		NameServer:   network.NameServer,
 		Boot:         "order=scsi0",

cloud/services/compute/instance/reconcile.go

@@ -78,8 +78,6 @@ spec:
                     type: string
                   path:
                     type: string
-                required:
-                - name
                 type: object
             required:
             - credentialsRef

config/crd/bases/infrastructure.cluster.x-k8s.io_proxmoxclusters.yaml

@@ -64,6 +64,19 @@ spec:
                   Zone. If multiple subnets are matched for the availability zone,
                   the first one returned is picked.
                 type: string
+              hardware:
+                description: Hardware
+                properties:
+                  cpu:
+                    default: 2
+                    description: 'number of CPU cores : 1 ~'
+                    type: integer
+                  memoty:
+                    default: 4096
+                    description: 'amount of RAM for the VM in MiB : 16 ~'
+                    minimum: 16
+                    type: integer
+                type: object
               network:
                 description: Network
                 properties:

config/crd/bases/infrastructure.cluster.x-k8s.io_proxmoxmachines.yaml

@@ -102,6 +102,19 @@ spec:
                           to an AWS Availability Zone. If multiple subnets are matched
                           for the availability zone, the first one returned is picked.
                         type: string
+                      hardware:
+                        description: Hardware
+                        properties:
+                          cpu:
+                            default: 2
+                            description: 'number of CPU cores : 1 ~'
+                            type: integer
+                          memoty:
+                            default: 4096
+                            description: 'amount of RAM for the VM in MiB : 16 ~'
+                            minimum: 16
+                            type: integer
+                        type: object
                       network:
                         description: Network
                         properties: