fix bugs: storage/instance reconciler

Author: sp-yduck

cloud/services/compute/instance/qemu.go

@@ -38,6 +38,7 @@ func (s *Service) reconcileQEMU(ctx context.Context) (*proxmox.VirtualMachine, e
 	return s.createQEMU(ctx, nodeName, vmid)
 }
 
+// get QEMU gets proxmox vm from vmid
 func (s *Service) getQEMU(ctx context.Context, vmid *int) (*proxmox.VirtualMachine, error) {
 	if vmid != nil {
 		return s.client.VirtualMachine(ctx, *vmid)
@@ -68,6 +69,7 @@ func (s *Service) createQEMU(ctx context.Context, nodeName string, vmid *int) (*
 			return nil, err
 		}
 		vmid = &nextid
+		s.scope.SetVMID(*vmid)
 	}
 
 	vmoption := generateVMOptions(s.scope.Name(), s.scope.GetStorage().Name, s.scope.GetNetwork(), s.scope.GetHardware())
@@ -76,7 +78,6 @@ func (s *Service) createQEMU(ctx context.Context, nodeName string, vmid *int) (*
 		log.Error(err, fmt.Sprintf("failed to create qemu instance %s", vm.VM.Name))
 		return nil, err
 	}
-	s.scope.SetVMID(*vmid)
 	return vm, nil
 }
 

cloud/services/compute/instance/reconcile.go

@@ -38,6 +38,8 @@ func (s *Service) Reconcile(ctx context.Context) error {
 		return err
 	}
 	s.scope.SetInstanceStatus(infrav1.InstanceStatus(instance.VM.Status))
+	s.scope.SetNodeName(instance.Node)
+	s.scope.SetVMID(instance.VM.VMID)
 	// s.scope.SetAddresses()
 	return nil
 }
@@ -47,11 +49,12 @@ func (s *Service) Delete(ctx context.Context) error {
 	log := log.FromContext(ctx)
 	log.Info("Deleting instance resources")
 
-	instance, err := s.getInstance(ctx)
+	instance, err := s.getQEMU(ctx, s.scope.GetVMID())
 	if err != nil {
 		if !rest.IsNotFound(err) {
 			return err
 		}
+		log.Info("qemu is not found or already deleted")
 		return nil
 	}
 
@@ -86,7 +89,7 @@ func (s *Service) createOrGetInstance(ctx context.Context) (*proxmox.VirtualMach
 	return instance, nil
 }
 
-// getInstance get vm from providerID
+// getInstance() gets proxmoxm vm from providerID
 func (s *Service) getInstance(ctx context.Context) (*proxmox.VirtualMachine, error) {
 	log := log.FromContext(ctx)
 

cloud/services/compute/storage/reconcile.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 
 	"github.com/sp-yduck/proxmox-go/api"
+	"github.com/sp-yduck/proxmox-go/proxmox"
 	"github.com/sp-yduck/proxmox-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
@@ -68,8 +69,10 @@ func (s *Service) deleteStorage(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
+
+	var storage *proxmox.Storage
 	for _, node := range nodes {
-		storage, err := s.client.Storage(ctx, s.scope.Storage().Name)
+		storage, err = s.client.Storage(ctx, s.scope.Storage().Name)
 		if err != nil {
 			log.Info(err.Error())
 			continue
@@ -84,12 +87,12 @@ func (s *Service) deleteStorage(ctx context.Context) error {
 		if len(contents) > 0 {
 			return errors.New("Storage must be empty to be deleted")
 		}
+	}
 
-		// delete
-		if err := storage.Delete(ctx); err != nil {
-			log.Info(err.Error())
-			return err
-		}
+	// delete
+	if err := storage.Delete(ctx); err != nil {
+		log.Info(err.Error())
+		return err
 	}
 	return nil
 }