Merge pull request #48 from sp-yduck/proxmox-go

proxmox sdk / latest ccm

Author: sp-yduck

README.md

@@ -24,16 +24,18 @@ clusterctl init --infrastructure=proxmox:v0.2.2 --config https://raw.githubuserc
 2. Create your first workload cluster
 ```sh
 # export env variables
-export CONTROLPLANE_HOST=X.X.X.X   # control-plane vip
-export PROXMOX_URL=X.X.X.X:8006
-export PROXMOX_PASSWORD=password
-export PROXMOX_USER=user@pam
+export CONTROLPLANE_HOST=X.X.X.X                          # control-plane vip
+export PROXMOX_URL=https://X.X.X.X:8006/api2/json
+# export PROXMOX_PASSWORD=password                        # (optional)
+# export PROXMOX_USER=user@pam                            # (optional)
+export PROXMOX_TOKENID='root@pam!api-token-id'            # (optional)
+export PROXMOX_SECRET=aaaaaaaa-bbbb-cccc-dddd-ee12345678  # (optional)
 export NODE_URL=node.ssh.url:22
 export NODE_USER=node-ssh-user
 export NODE_PASSWORD=node-ssh-password
 
-# generate manifests (available flags: --target-namespace, --kubernetes-version, --controlplane-machine-count, --worker-machine-count)
-clusterctl generate cluster cappx-test --worker-machine-count=3 --infrastructure=proxmox:v0.2.2 --config https://raw.githubusercontent.com/sp-yduck/cluster-api-provider-proxmox/main/clusterctl.yaml > cappx-test.yaml
+# generate manifests (available flags: --target-namespace, --kubernetes-version, --control-plane-machine-count, --worker-machine-count)
+clusterctl generate cluster cappx-test --control-plane-machine-count=3 --infrastructure=proxmox:v0.2.2 --config https://raw.githubusercontent.com/sp-yduck/cluster-api-provider-proxmox/main/clusterctl.yaml > cappx-test.yaml
 
 # inspect and edit
 vi cappx-test.yaml

api/v1beta1/type.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/sp-yduck/proxmox/pkg/service/node/vm"
+	"github.com/sp-yduck/proxmox-go/api"
 )
 
 // ServerRef is used for configuring Proxmox client
@@ -127,7 +127,7 @@ type Storage struct {
 type InstanceStatus string
 
 var (
-	InstanceStatusPaused  = InstanceStatus(vm.ProcessStatusPaused)
-	InstanceStatusRunning = InstanceStatus(vm.ProcessStatusRunning)
-	InstanceStatusStopped = InstanceStatus(vm.ProcessStatusStopped)
+	InstanceStatusPaused  = InstanceStatus(api.ProcessStatusPaused)
+	InstanceStatusRunning = InstanceStatus(api.ProcessStatusRunning)
+	InstanceStatusStopped = InstanceStatus(api.ProcessStatusStopped)
 )

cloud/interfaces.go

@@ -3,7 +3,7 @@ package cloud
 import (
 	"context"
 
-	"github.com/sp-yduck/proxmox/pkg/service"
+	"github.com/sp-yduck/proxmox-go/proxmox"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
 	infrav1 "github.com/sp-yduck/cluster-api-provider-proxmox/api/v1beta1"
@@ -16,7 +16,7 @@ type Reconciler interface {
 }
 
 type Client interface {
-	CloudClient() *service.Service
+	CloudClient() *proxmox.Service
 	RemoteClient() *scope.SSHClient
 }
 

cloud/scope/clients.go

@@ -20,19 +20,19 @@ import (
 	"context"
 
 	"github.com/pkg/errors"
-	"github.com/sp-yduck/proxmox/pkg/service"
+	"github.com/sp-yduck/proxmox-go/proxmox"
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	infrav1 "github.com/sp-yduck/cluster-api-provider-proxmox/api/v1beta1"
 )
 
 type ProxmoxServices struct {
-	Compute *service.Service
+	Compute *proxmox.Service
 	Remote  *SSHClient
 }
 
-func newComputeService(ctx context.Context, serverRef infrav1.ServerRef, crClient client.Client) (*service.Service, error) {
+func newComputeService(ctx context.Context, serverRef infrav1.ServerRef, crClient client.Client) (*proxmox.Service, error) {
 	secretRef := serverRef.SecretRef
 	if secretRef == nil {
 		return nil, errors.New("failed to get proxmox client form nil secretRef")
@@ -44,16 +44,14 @@ func newComputeService(ctx context.Context, serverRef infrav1.ServerRef, crClien
 		return nil, err
 	}
 
-	proxmoxUser, ok := secret.Data["PROXMOX_USER"]
-	if !ok {
-		return nil, errors.Errorf("failed to fetch PROXMOX_USER from Secret : %v", key)
-	}
-	proxmoxPassword, ok := secret.Data["PROXMOX_PASSWORD"]
-	if !ok {
-		return nil, errors.Errorf("failed to fetch PROXMOX_PASSWORD from Secret : %v", key)
+	authConfig := proxmox.AuthConfig{
+		Username: string(secret.Data["PROXMOX_USER"]),
+		Password: string(secret.Data["PROXMOX_PASSWORD"]),
+		TokenID:  string(secret.Data["PROXMOX_TOKENID"]),
+		Secret:   string(secret.Data["PROXMOX_SECRET"]),
 	}
 
-	return service.NewServiceWithLogin(serverRef.Endpoint, string(proxmoxUser), string(proxmoxPassword))
+	return proxmox.NewService(serverRef.Endpoint, authConfig, true)
 }
 
 func newRemoteClient(ctx context.Context, secretRef *infrav1.ObjectReference, crClient client.Client) (*SSHClient, error) {

cloud/scope/cluster.go

@@ -20,12 +20,12 @@ import (
 	"context"
 
 	"github.com/pkg/errors"
+	"github.com/sp-yduck/proxmox-go/proxmox"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/util/patch"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	infrav1 "github.com/sp-yduck/cluster-api-provider-proxmox/api/v1beta1"
-	"github.com/sp-yduck/proxmox/pkg/service"
 )
 
 type ClusterScopeParams struct {
@@ -110,7 +110,7 @@ func (s *ClusterScope) Storage() infrav1.Storage {
 	return s.ProxmoxCluster.Spec.Storage
 }
 
-func (s *ClusterScope) CloudClient() *service.Service {
+func (s *ClusterScope) CloudClient() *proxmox.Service {
 	return s.ProxmoxServices.Compute
 }
 

cloud/scope/machine.go

@@ -20,6 +20,7 @@ import (
 	"context"
 
 	"github.com/pkg/errors"
+	"github.com/sp-yduck/proxmox-go/proxmox"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/utils/pointer"
@@ -31,7 +32,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/proxmox/pkg/service"
 )
 
 type MachineScopeParams struct {
@@ -78,7 +78,7 @@ type MachineScope struct {
 	ClusterGetter  *ClusterScope
 }
 
-func (m *MachineScope) CloudClient() *service.Service {
+func (m *MachineScope) CloudClient() *proxmox.Service {
 	return m.ClusterGetter.CloudClient()
 }
 

cloud/services/compute/instance/cloudinit.go

@@ -1,6 +1,7 @@
 package instance
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/pkg/errors"
@@ -24,28 +25,21 @@ func (s *Service) reconcileCloudInit(bootstrap string) error {
 }
 
 // delete CloudConfig
-func (s *Service) deleteCloudConfig() error {
+func (s *Service) deleteCloudConfig(ctx context.Context) error {
 	storageName := s.scope.GetStorage().Name
 	path := userSnippetPath(s.scope.Name())
 	volumeID := fmt.Sprintf("%s:%s", storageName, path)
 
-	node, err := s.client.Node(s.scope.NodeName())
+	node, err := s.client.Node(ctx, s.scope.NodeName())
 	if err != nil {
 		return err
 	}
-	storage, err := node.Storage(storageName)
+	storage, err := s.client.Storage(ctx, storageName)
 	if err != nil {
 		return err
 	}
-	content, err := storage.GetContent(volumeID)
-	if IsNotFound(err) { // return nil if it's already deleted
-		return nil
-	}
-	if err != nil {
-		return err
-	}
-
-	return content.DeleteVolume()
+	storage.Node = node.Node
+	return storage.DeleteVolume(ctx, volumeID)
 }
 
 func (s *Service) reconcileCloudInitUser(bootstrap string) error {

cloud/services/compute/instance/image.go

@@ -7,15 +7,15 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"github.com/sp-yduck/proxmox/pkg/service/node/vm"
+	"github.com/sp-yduck/proxmox-go/proxmox"
 	"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 {
+func (s *Service) reconcileBootDevice(ctx context.Context, vm *proxmox.VirtualMachine) error {
 	vmid := s.scope.GetVMID()
 	storage := s.scope.GetStorage()
 	image := s.scope.GetImage()
@@ -24,12 +24,12 @@ func (s *Service) reconcileBootDevice(ctx context.Context, vm *vm.VirtualMachine
 	log.Info(fmt.Sprintf("%v", hardware))
 
 	// os image
-	if err := SetCloudImage(ctx, *vmid, storage, image, s.remote); err != nil {
+	if err := setCloudImage(ctx, *vmid, storage, image, s.remote); err != nil {
 		return err
 	}
 
 	// volume
-	if err := vm.ResizeVolume("scsi0", hardware.Disk); err != nil {
+	if err := vm.ResizeVolume(ctx, "scsi0", hardware.Disk); err != nil {
 		return err
 	}
 
@@ -38,7 +38,7 @@ func (s *Service) reconcileBootDevice(ctx context.Context, vm *vm.VirtualMachine
 
 // 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 {
+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")