refactor: SetProviderID()

Author: sp-yduck

cloud/interfaces.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"github.com/sp-yduck/proxmox/pkg/service"
-	"github.com/sp-yduck/proxmox/pkg/service/node/vm"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
 	infrav1 "github.com/sp-yduck/cluster-api-provider-proxmox/api/v1beta1"
@@ -55,6 +54,7 @@ type MachineGetter interface {
 	// ControlPlaneGroupName() string
 	NodeName() string
 	GetInstanceID() *string
+	GetImage() infrav1.Image
 	GetProviderID() string
 	GetBootstrapData() (string, error)
 	GetInstanceStatus() *infrav1.InstanceStatus
@@ -66,7 +66,7 @@ type MachineGetter interface {
 
 // MachineSetter is an interface which can set machine information.
 type MachineSetter interface {
-	SetProviderID(instance *vm.VirtualMachine) error
+	SetProviderID(node string, vmid int) error
 	SetInstanceStatus(v infrav1.InstanceStatus)
 	SetNodeName(name string)
 	// SetFailureMessage(v error)

cloud/scope/machine.go

@@ -20,7 +20,6 @@ import (
 	"context"
 
 	"github.com/pkg/errors"
-	"github.com/sp-yduck/proxmox/pkg/service/node/vm"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/utils/pointer"
@@ -159,6 +158,10 @@ func (m *MachineScope) GetProviderID() string {
 	return ""
 }
 
+func (m *MachineScope) GetImage() infrav1.Image {
+	return m.ProxmoxMachine.Spec.Image
+}
+
 func (m *MachineScope) GetCloudInit() infrav1.CloudInit {
 	return m.ProxmoxMachine.Spec.CloudInit
 }
@@ -179,8 +182,8 @@ func (m *MachineScope) GetHardware() infrav1.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)
+func (m *MachineScope) SetProviderID(node string, vmid int) error {
+	providerid, err := providerid.New(node, vmid)
 	if err != nil {
 		return err
 	}

cloud/services/compute/instance/reconcile.go

@@ -29,8 +29,9 @@ func (s *Service) Reconcile(ctx context.Context) error {
 	}
 	log.Info(fmt.Sprintf("instance : %v", instance))
 
-	s.scope.SetProviderID(instance)
+	s.scope.SetProviderID(instance.Node.Name(), instance.VMID)
 	s.scope.SetInstanceStatus(infrav1.InstanceStatus(instance.Status))
+	// s.scope.SetAddresses()
 	return nil
 }