Merge pull request #19 from sp-yduck/disk-size

fix #12

Author: sp-yduck

api/v1beta1/type.go

@@ -63,6 +63,10 @@ type Hardware struct {
 	// +kubebuilder:validation:Minimum:=16
 	// +kubebuilder:default:=4096
 	Memory int `json:"memory,omitempty"`
+
+	// hard disk size
+	// +kubebuilder:default:="50G"
+	Disk string `json:"disk,omitempty"`
 }
 
 // Network

cloud/scope/machine.go

@@ -181,6 +181,10 @@ func (m *MachineScope) GetHardware() infrav1.Hardware {
 	if m.ProxmoxMachine.Spec.Hardware.Memory == 0 {
 		m.ProxmoxMachine.Spec.Hardware.Memory = 4096
 	}
+	// to do: validation
+	if m.ProxmoxMachine.Spec.Hardware.Disk == "" {
+		m.ProxmoxMachine.Spec.Hardware.Disk = "50G"
+	}
 	return m.ProxmoxMachine.Spec.Hardware
 }
 

cloud/services/compute/instance/image.go

@@ -0,0 +1,64 @@
+package instance
+
+import (
+	"context"
+	"fmt"
+	"path"
+
+	"github.com/pkg/errors"
+	"github.com/sp-yduck/proxmox/pkg/service/node/vm"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+
+	infrav1 "github.com/sp-yduck/cluster-api-provider-proxmox/api/v1beta1"
+	"github.com/sp-yduck/cluster-api-provider-proxmox/cloud/scope"
+)
+
+// reconcileBootDevice
+func (s *Service) reconcileBootDevice(ctx context.Context, vm *vm.VirtualMachine) error {
+	vmid := s.scope.GetVMID()
+	storage := s.scope.GetStorage()
+	image := s.scope.GetImage()
+	hardware := s.scope.GetHardware()
+	log := log.FromContext(ctx)
+	log.Info(fmt.Sprintf("%v", hardware))
+
+	// os image
+	if err := SetCloudImage(ctx, *vmid, storage, image, s.remote); err != nil {
+		return err
+	}
+
+	// volume
+	if err := vm.ResizeVolume("scsi0", hardware.Disk); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// setCloudImage downloads OS image into Proxmox node
+// and then sets it to specified storage
+func SetCloudImage(ctx context.Context, vmid int, storage infrav1.Storage, image infrav1.Image, ssh scope.SSHClient) error {
+	log := log.FromContext(ctx)
+	log.Info("setting cloud image")
+
+	url := image.URL
+	fileName := path.Base(url)
+	rawImageDirPath := fmt.Sprintf("%s/images", etcCAPP)
+	rawImageFilePath := fmt.Sprintf("%s/%s", rawImageDirPath, fileName)
+
+	// workaround
+	// API does not support something equivalent of "qm importdisk"
+	out, err := ssh.RunCommand(fmt.Sprintf("wget %s --directory-prefix %s -nc", url, rawImageDirPath))
+	if err != nil {
+		return errors.Errorf("failed to download image: %s : %v", out, err)
+	}
+
+	// to do: should confirm if the checksum matchies
+
+	destPath := fmt.Sprintf("%s/images/%d/vm-%d-disk-0.raw", storage.Path, vmid, vmid)
+	out, err = ssh.RunCommand(fmt.Sprintf("/usr/bin/qemu-img convert -O raw %s %s", rawImageFilePath, destPath))
+	if err != nil {
+		return errors.Errorf("failed to convert iamge : %s : %v", out, err)
+	}
+	return nil
+}

cloud/services/compute/instance/reconcile.go

@@ -3,7 +3,6 @@ package instance
 import (
 	"context"
 	"fmt"
-	"path"
 	"regexp"
 	"strconv"
 	"strings"
@@ -16,7 +15,6 @@ import (
 
 	infrav1 "github.com/sp-yduck/cluster-api-provider-proxmox/api/v1beta1"
 	"github.com/sp-yduck/cluster-api-provider-proxmox/cloud/providerid"
-	"github.com/sp-yduck/cluster-api-provider-proxmox/cloud/scope"
 )
 
 const (
@@ -206,14 +204,8 @@ func (s *Service) CreateInstance(ctx context.Context, bootstrap string) (*vm.Vir
 		return nil, err
 	}
 
-	// os image
-	if err := SetCloudImage(ctx, vmid, s.scope.GetStorage(), s.scope.GetImage(), s.remote); err != nil {
-		return nil, err
-	}
-
-	// volume
-	// to do: size option
-	if err := vm.ResizeVolume("scsi0", "+30G"); err != nil {
+	// set cloud image to hard disk and then resize
+	if err := s.reconcileBootDevice(ctx, vm); err != nil {
 		return nil, err
 	}
 
@@ -228,31 +220,6 @@ func IsNotFound(err error) bool {
 	return api.IsNotFound(err)
 }
 
-// setCloudImage set OS image to specified storage
-func SetCloudImage(ctx context.Context, vmid int, storage infrav1.Storage, image infrav1.Image, ssh scope.SSHClient) error {
-	log := log.FromContext(ctx)
-	log.Info("setting cloud image")
-
-	url := image.URL
-	fileName := path.Base(url)
-	rawImageDirPath := fmt.Sprintf("%s/images", etcCAPP)
-	rawImageFilePath := fmt.Sprintf("%s/%s", rawImageDirPath, fileName)
-
-	// workaround
-	// API does not support something equivalent of "qm importdisk"
-	out, err := ssh.RunCommand(fmt.Sprintf("wget %s --directory-prefix %s -nc", url, rawImageDirPath))
-	if err != nil {
-		return errors.Errorf("failed to download image: %s : %v", out, err)
-	}
-
-	destPath := fmt.Sprintf("%s/images/%d/vm-%d-disk-0.raw", storage.Path, vmid, vmid)
-	out, err = ssh.RunCommand(fmt.Sprintf("/usr/bin/qemu-img convert -O raw %s %s", rawImageFilePath, destPath))
-	if err != nil {
-		return errors.Errorf("failed to convert iamge : %s : %v", out, err)
-	}
-	return nil
-}
-
 func EnsureRunning(instance vm.VirtualMachine) error {
 	// ensure instance is running
 	switch instance.Status {

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

@@ -85,6 +85,10 @@ spec:
                     default: 2
                     description: 'number of CPU cores : 1 ~'
                     type: integer
+                  disk:
+                    default: 50G
+                    description: hard disk size
+                    type: string
                   memory:
                     default: 4096
                     description: 'amount of RAM for the VM in MiB : 16 ~'

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

@@ -109,6 +109,10 @@ spec:
                             default: 2
                             description: 'number of CPU cores : 1 ~'
                             type: integer
+                          disk:
+                            default: 50G
+                            description: hard disk size
+                            type: string
                           memory:
                             default: 4096
                             description: 'amount of RAM for the VM in MiB : 16 ~'