add vm options

Author: sp-yduck

api/v1beta1/options_types.go

@@ -1,5 +1,7 @@
 package v1beta1
 
+import "strconv"
+
 // import "encoding/json"
 
 // +kubebuilder:validation:Enum:=x86_64;aarch64
@@ -17,6 +19,28 @@ type Lock string
 // +kubebuilder:validation:Enum:=other;wxp;w2k;w2k3;w2k8;wvista;win7;win8;win10;win11;l24;l26;solaris
 type OSType string
 
+// +kubebuilder:validation:Pattern:="[a-zA-Z0-9-_.;]+"
+type Tag string
+
+type Tags []Tag
+
+func (h *HugePages) String() string {
+	if h == nil {
+		return ""
+	} else if *h == 0 {
+		return "any"
+	}
+	return strconv.Itoa(int(*h))
+}
+
+func (t *Tags) String() string {
+	var tags string
+	for _, tag := range *t {
+		tags += string(tag) + ";"
+	}
+	return tags
+}
+
 // Options
 type Options struct {
 	// Enable/Disable ACPI. Defaults to true.
@@ -41,7 +65,7 @@ type Options struct {
 	// HotPlug []HotPlugDevice `json:"hotPlug,omitempty"`
 
 	// enable/disable hugepages memory. 0 or 2 or 1024. 0 indicated 'any'
-	HugePages HugePages `json:"hugePages,omitempty"`
+	HugePages *HugePages `json:"hugePages,omitempty"`
 
 	// Use together with hugepages. If enabled, hugepages will not not be deleted
 	// after VM shutdown and can be used for subsequent starts. Defaults to false.
@@ -105,7 +129,7 @@ type Options struct {
 	Tablet bool `json:"tablet,omitempty"`
 
 	// Tags of the VM. This is only meta information.
-	Tags []string `json:"tags,omitempty"`
+	Tags Tags `json:"tags,omitempty"`
 
 	// Enable/disable time drift fix. Defaults to false.
 	TimeDriftFix bool `json:"timeDriftFix,omitempty"`
@@ -121,6 +145,7 @@ type Options struct {
 
 	// VGA string `json:"vga,omitempty"`
 
+	// +kubebuilder:validation:Pattern:="(?:[a-fA-F0-9]{8}(?:-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}|[01])"
 	// The VM generation ID (vmgenid) device exposes a 128-bit integer value identifier to the guest OS.
 	// This allows to notify the guest operating system when the virtual machine is executed with a different configuration
 	// (e.g. snapshot execution or creation from a template).

api/v1beta1/zz_generated.deepcopy.go

@@ -62,6 +62,7 @@ type MachineGetter interface {
 	GetNetwork() infrav1.Network
 	GetHardware() infrav1.Hardware
 	GetVMID() *int
+	GetOptions() infrav1.Options
 }
 
 // MachineSetter is an interface which can set machine information.

cloud/interfaces.go

@@ -185,6 +185,10 @@ func (m *MachineScope) GetHardware() infrav1.Hardware {
 	return m.ProxmoxMachine.Spec.Hardware
 }
 
+func (m *MachineScope) GetOptions() infrav1.Options {
+	return m.ProxmoxMachine.Spec.Options
+}
+
 // SetProviderID sets the ProxmoxMachine providerID in spec.
 func (m *MachineScope) SetProviderID(uuid string) error {
 	providerid, err := providerid.New(uuid)

cloud/scope/machine.go

@@ -11,8 +11,6 @@ import (
 	"github.com/sp-yduck/proxmox-go/proxmox"
 	"github.com/sp-yduck/proxmox-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/log"
-
-	infrav1 "github.com/sp-yduck/cluster-api-provider-proxmox/api/v1beta1"
 )
 
 const (
@@ -72,7 +70,7 @@ func (s *Service) createQEMU(ctx context.Context, nodeName string, vmid *int) (*
 		s.scope.SetVMID(*vmid)
 	}
 
-	vmoption := generateVMOptions(s.scope.Name(), s.scope.GetStorage().Name, s.scope.GetNetwork(), s.scope.GetHardware())
+	vmoption := s.generateVMOptions()
 	vm, err := s.client.CreateVirtualMachine(ctx, nodeName, *vmid, vmoption)
 	if err != nil {
 		log.Error(err, fmt.Sprintf("failed to create qemu instance %s", vm.VM.Name))
@@ -103,24 +101,60 @@ func (s *Service) getRandomNode(ctx context.Context) (*api.Node, error) {
 	return nodes[r.Intn(len(nodes))], nil
 }
 
-func generateVMOptions(vmName, storageName string, network infrav1.Network, hardware infrav1.Hardware) api.VirtualMachineCreateOptions {
+func (s *Service) generateVMOptions() api.VirtualMachineCreateOptions {
+	vmName := s.scope.Name()
+	storageName := s.scope.GetStorage().Name
+	network := s.scope.GetNetwork()
+	hardware := s.scope.GetHardware()
+	options := s.scope.GetOptions()
+
 	vmoptions := api.VirtualMachineCreateOptions{
-		Agent:        "enabled=1",
-		Cores:        hardware.CPU,
-		Memory:       hardware.Memory,
-		Name:         vmName,
-		NameServer:   network.NameServer,
-		Boot:         fmt.Sprintf("order=%s", bootDvice),
-		Ide:          api.Ide{Ide2: fmt.Sprintf("file=%s:cloudinit,media=cdrom", storageName)},
-		CiCustom:     fmt.Sprintf("user=%s:%s", storageName, userSnippetPath(vmName)),
-		IPConfig:     api.IPConfig{IPConfig0: network.IPConfig.String()},
-		OSType:       api.L26,
-		Net:          api.Net{Net0: "model=virtio,bridge=vmbr0,firewall=1"},
-		Scsi:         api.Scsi{Scsi0: fmt.Sprintf("file=%s:8", storageName)},
-		ScsiHw:       api.VirtioScsiPci,
-		SearchDomain: network.SearchDomain,
-		Serial:       api.Serial{Serial0: "socket"},
-		VGA:          "serial0",
+		ACPI:          boolToInt8(options.ACPI),
+		Agent:         "enabled=1",
+		Arch:          api.Arch(options.Arch),
+		Balloon:       options.Balloon,
+		BIOS:          string(hardware.BIOS),
+		Boot:          fmt.Sprintf("order=%s", bootDvice),
+		CiCustom:      fmt.Sprintf("user=%s:%s", storageName, userSnippetPath(vmName)),
+		Cores:         hardware.CPU,
+		CpuLimit:      hardware.CPULimit,
+		Description:   options.Description,
+		HugePages:     options.HugePages.String(),
+		Ide:           api.Ide{Ide2: fmt.Sprintf("file=%s:cloudinit,media=cdrom", storageName)},
+		IPConfig:      api.IPConfig{IPConfig0: network.IPConfig.String()},
+		KeepHugePages: boolToInt8(options.KeepHugePages),
+		KVM:           boolToInt8(options.KVM),
+		LocalTime:     boolToInt8(options.LocalTime),
+		Lock:          string(options.Lock),
+		Memory:        hardware.Memory,
+		Name:          vmName,
+		NameServer:    network.NameServer,
+		Net:           api.Net{Net0: "model=virtio,bridge=vmbr0,firewall=1"},
+		Numa:          boolToInt8(options.NUMA),
+		OnBoot:        boolToInt8(options.OnBoot),
+		OSType:        api.OSType(options.OSType),
+		Protection:    boolToInt8(options.Protection),
+		Reboot:        int(boolToInt8(options.Reboot)),
+		Scsi:          api.Scsi{Scsi0: fmt.Sprintf("file=%s:8", storageName)},
+		ScsiHw:        api.VirtioScsiPci,
+		SearchDomain:  network.SearchDomain,
+		Serial:        api.Serial{Serial0: "socket"},
+		Shares:        options.Shares,
+		Sockets:       hardware.Sockets,
+		Tablet:        boolToInt8(options.Tablet),
+		Tags:          options.Tags.String(),
+		TDF:           boolToInt8(options.TimeDriftFix),
+		Template:      boolToInt8(options.Template),
+		VCPUs:         options.VCPUs,
+		VMGenID:       options.VMGenerationID,
+		VGA:           "serial0",
 	}
 	return vmoptions
 }
+
+func boolToInt8(b bool) int8 {
+	if b {
+		return 1
+	}
+	return 0
+}

cloud/services/compute/instance/qemu.go

@@ -287,6 +287,7 @@ spec:
                   tags:
                     description: Tags of the VM. This is only meta information.
                     items:
+                      pattern: '[a-zA-Z0-9-_.;]+'
                       type: string
                     type: array
                   template:
@@ -311,6 +312,7 @@ spec:
                       works when done through API/CLI create or update methods, but
                       not when manually editing the config file. regex: (?:[a-fA-F0-9]{8}(?:-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}|[01]).
                       Defaults to 1 (autogenerated)'
+                    pattern: (?:[a-fA-F0-9]{8}(?:-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}|[01])
                     type: string
                 type: object
               providerID:

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

@@ -315,6 +315,7 @@ spec:
                           tags:
                             description: Tags of the VM. This is only meta information.
                             items:
+                              pattern: '[a-zA-Z0-9-_.;]+'
                               type: string
                             type: array
                           template:
@@ -342,6 +343,7 @@ spec:
                               methods, but not when manually editing the config file.
                               regex: (?:[a-fA-F0-9]{8}(?:-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}|[01]).
                               Defaults to 1 (autogenerated)'
+                            pattern: (?:[a-fA-F0-9]{8}(?:-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}|[01])
                             type: string
                         type: object
                       providerID:

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

@@ -7,7 +7,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.11.0
 	github.com/onsi/gomega v1.27.10
 	github.com/pkg/errors v0.9.1
-	github.com/sp-yduck/proxmox-go v0.0.0-20230803145313-0e5082ef8998
+	github.com/sp-yduck/proxmox-go v0.0.0-20230807140547-f03780ca1110
 	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.26.1
 	k8s.io/apimachinery v0.26.1

go.mod

@@ -290,8 +290,8 @@ github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5g
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
-github.com/sp-yduck/proxmox-go v0.0.0-20230803145313-0e5082ef8998 h1:W9Ab56G2klKV0XzPOSnX10kGwvConkftI5riBj48+KE=
-github.com/sp-yduck/proxmox-go v0.0.0-20230803145313-0e5082ef8998/go.mod h1:XtUQue7w5tuB6c7xputkhnN+A3EZbzDWq+uXmlkOPfQ=
+github.com/sp-yduck/proxmox-go v0.0.0-20230807140547-f03780ca1110 h1:TJqu6ZnBbz7rL+ZTMX7RyNUoKhAGlBpbAREb2M/ANMo=
+github.com/sp-yduck/proxmox-go v0.0.0-20230807140547-f03780ca1110/go.mod h1:XtUQue7w5tuB6c7xputkhnN+A3EZbzDWq+uXmlkOPfQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=