remove controlplane load balancer reconciler for now

Author: sp-yduck

api/v1beta1/zz_generated.deepcopy.go

@@ -38,7 +38,6 @@ type ClusterGetter interface {
 	// FailureDomains() clusterv1.FailureDomains
 	ControlPlaneEndpoint() clusterv1.APIEndpoint
 	Storage() infrav1.Storage
-	LoadBalancer() infrav1.LoadBalancer
 }
 
 type ClusterSettter interface {

cloud/interfaces.go

@@ -97,10 +97,6 @@ func (s *ClusterScope) Storage() infrav1.Storage {
 	return s.ProxmoxCluster.Spec.Storage
 }
 
-func (s *ClusterScope) LoadBalancer() infrav1.LoadBalancer {
-	return s.ProxmoxCluster.Spec.LoadBalancer
-}
-
 func (s *ClusterScope) CloudClient() *service.Service {
 	return s.ProxmoxServices.Compute
 }

cloud/scope/cluster.go

@@ -127,19 +127,19 @@ func (s *Service) CreateInstance(ctx context.Context, bootstrap string) (*vm.Vir
 		return nil, err
 	}
 
-	if err := applyCICustom(vmid, s.scope.Name(), s.scope.GetStorage().Name, s.remote); err != nil {
+	if err := ApplyCICustom(vmid, s.scope.Name(), s.scope.GetStorage().Name, s.remote); err != nil {
 		return nil, err
 	}
 
-	if err := setCloudImage(ctx, vmid, s.scope.GetStorage().Name, s.remote); err != nil {
+	if err := SetCloudImage(ctx, vmid, s.scope.GetStorage().Name, s.remote); err != nil {
 		return nil, err
 	}
 
 	if err := vm.ResizeVolume("scsi0", "+30G"); err != nil {
 		return nil, err
 	}
 
-	if err := ensureRunning(*vm); err != nil {
+	if err := EnsureRunning(*vm); err != nil {
 		return nil, err
 	}
 	return vm, nil
@@ -184,7 +184,7 @@ func (s *Service) Delete(ctx context.Context) error {
 	return instance.Delete()
 }
 
-func setCloudImage(ctx context.Context, vmid int, storageName string, ssh scope.SSHClient) error {
+func SetCloudImage(ctx context.Context, vmid int, storageName string, ssh scope.SSHClient) error {
 	log := log.FromContext(ctx)
 	log.Info("setting cloud image")
 
@@ -229,7 +229,7 @@ func setCloudConfig(ctx context.Context, vmName, storageName, bootstrap string,
 	return nil
 }
 
-func applyCICustom(vmid int, vmName, storageName string, ssh scope.SSHClient) error {
+func ApplyCICustom(vmid int, vmName, storageName string, ssh scope.SSHClient) error {
 	cicustom := fmt.Sprintf("user=%s:snippets/%s.yml", storageName, vmName)
 	out, err := ssh.RunCommand(fmt.Sprintf("qm set %d --cicustom '%s'", vmid, cicustom))
 	if err != nil {
@@ -241,19 +241,19 @@ func applyCICustom(vmid int, vmName, storageName string, ssh scope.SSHClient) er
 
 func generateVMOptions(vmName, storageName string) vm.VirtualMachineCreateOptions {
 	vmoptions := vm.VirtualMachineCreateOptions{
-		Agent:    "enabled=1",
-		Cores:    2,
-		Memory:   1024 * 4,
-		Name:     vmName,
-		Boot:     "order=scsi0",
-		Ide:      vm.Ide{Ide2: fmt.Sprintf("file=%s:cloudinit,media=cdrom", storageName)},
-		IPConfig: vm.IPConfig{IPConfig0: "ip=dhcp"},
-		OSType:   vm.L26,
-		Net:      vm.Net{Net0: "model=virtio,bridge=vmbr0,firewall=1"},
-		Scsi:     vm.Scsi{Scsi0: fmt.Sprintf("file=%s:16", storageName)},
-		ScsiHw:   vm.VirtioScsiPci,
-		Serial:   vm.Serial{Serial0: "socket"},
-		VGA:      "serial0",
+		Agent:  "enabled=1",
+		Cores:  2,
+		Memory: 1024 * 4,
+		Name:   vmName,
+		Boot:   "order=scsi0",
+		Ide:    vm.Ide{Ide2: fmt.Sprintf("file=%s:cloudinit,media=cdrom", storageName)},
+		// IPConfig: vm.IPConfig{IPConfig0: "ip=dhcp"},
+		OSType: vm.L26,
+		Net:    vm.Net{Net0: "model=virtio,bridge=vmbr0,firewall=1"},
+		Scsi:   vm.Scsi{Scsi0: fmt.Sprintf("file=%s:8", storageName)},
+		ScsiHw: vm.VirtioScsiPci,
+		Serial: vm.Serial{Serial0: "socket"},
+		VGA:    "serial0",
 	}
 	return vmoptions
 }
@@ -267,7 +267,7 @@ func sshKeyUrlEncode(keys string) (encodedKeys string) {
 	return
 }
 
-func ensureRunning(instance vm.VirtualMachine) error {
+func EnsureRunning(instance vm.VirtualMachine) error {
 	// ensure instance is running
 	switch instance.Status {
 	case vm.ProcessStatusRunning:
@@ -286,6 +286,6 @@ func ensureRunning(instance vm.VirtualMachine) error {
 	return nil
 }
 
-// func ensureStopped(instance vm.VirtualMachine) error {
+// func EnsureStopped(instance vm.VirtualMachine) error {
 // 	return nil
 // }

cloud/services/compute/instance/reconcile.go

@@ -64,12 +64,19 @@ spec:
                 - name
                 - namespace
                 type: object
-              foo:
-                description: Foo is an example field of ProxmoxCluster. Edit proxmoxcluster_types.go
-                  to remove/update
-                type: string
+              storage:
+                description: storage is for proxmox storage used by vm instances
+                properties:
+                  name:
+                    type: string
+                  path:
+                    type: string
+                required:
+                - name
+                type: object
             required:
             - credentialsRef
+            - storage
             type: object
           status:
             description: ProxmoxClusterStatus defines the observed state of ProxmoxCluster

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

@@ -35,7 +35,6 @@ import (
 	infrav1 "github.com/sp-yduck/cluster-api-provider-proxmox/api/v1beta1"
 	"github.com/sp-yduck/cluster-api-provider-proxmox/cloud"
 	"github.com/sp-yduck/cluster-api-provider-proxmox/cloud/scope"
-	"github.com/sp-yduck/cluster-api-provider-proxmox/cloud/services/compute/loadbalancer"
 	"github.com/sp-yduck/cluster-api-provider-proxmox/cloud/services/compute/storage"
 )
 
@@ -115,12 +114,8 @@ func (r *ProxmoxClusterReconciler) reconcile(ctx context.Context, clusterScope *
 		return ctrl.Result{}, err
 	}
 
-	// failure domains
-	// to do
-
 	reconcilers := []cloud.Reconciler{
 		storage.NewService(clusterScope),
-		loadbalancer.NewService(clusterScope),
 	}
 
 	for _, r := range reconcilers {