Rebase

Author: mcbenjemaa

internal/service/vmservice/bootstrap.go

@@ -40,12 +40,6 @@ func reconcileBootstrapData(ctx context.Context, machineScope *scope.MachineScop
 		return false, nil
 	}
 
-	// TODO check if this needs to be re-enabled
-	//if !machineHasIPAddress(machineScope.ProxmoxMachine) {
-	//	// skip machine doesn't have an IpAddress yet.
-	//	conditions.MarkFalse(machineScope.ProxmoxMachine, infrav1alpha1.VMProvisionedCondition, infrav1alpha1.WaitingForStaticIPAllocationReason, clusterv1.ConditionSeverityWarning, "no ip address")
-	//	return true, nil
-	//}
 	if machineScope.VirtualMachine == nil {
 		// skip machine is not yet provisioned.
 		conditions.MarkFalse(machineScope.ProxmoxMachine, infrav1alpha1.VMProvisionedCondition, infrav1alpha1.WaitingForBootstrapDataReason, clusterv1.ConditionSeverityWarning, "no ip address")

internal/service/vmservice/ip.go

@@ -121,7 +121,6 @@ func handleIPAddressForDevice(ctx context.Context, machineScope *scope.MachineSc
 }
 
 func handleDefaultDevice(ctx context.Context, machineScope *scope.MachineScope, addresses map[string]infrav1.IPAddress) (bool, error) {
-
 	// check if the default network device is specified.
 	var networkDevice *infrav1.NetworkDevice
 	if machineScope.ProxmoxMachine.Spec.Network != nil && machineScope.ProxmoxMachine.Spec.Network.Default != nil {
@@ -167,11 +166,11 @@ func handleDefaultDevice(ctx context.Context, machineScope *scope.MachineScope,
 			addr.IPV6 = ip
 			addresses[infrav1.DefaultNetworkDevice] = addr
 		}
-
 	}
 	return false, nil
 }
 
+// nolint
 func handleAdditionalDevices(ctx context.Context, machineScope *scope.MachineScope, addresses map[string]infrav1.IPAddress) (bool, error) {
 	// additional network devices.
 	for _, net := range machineScope.ProxmoxMachine.Spec.Network.AdditionalDevices {
@@ -193,7 +192,6 @@ func handleAdditionalDevices(ctx context.Context, machineScope *scope.MachineSco
 					IPV4: ip,
 				}
 			}
-
 		}
 
 		if net.IPv6PoolRef != nil {
@@ -215,7 +213,6 @@ func handleAdditionalDevices(ctx context.Context, machineScope *scope.MachineSco
 					IPV6: ip,
 				}
 			}
-
 		}
 	}
 

internal/service/vmservice/vm.go

@@ -236,6 +236,8 @@ func reconcileMachineAddresses(ctx context.Context, scope *scope.MachineScope) e
 	return nil
 }
 
+// getMachineAddresses retruns the ip addresses for the machine
+// nolint
 func getMachineAddresses(ctx context.Context, scope *scope.MachineScope) ([]clusterv1.MachineAddress, error) {
 	if !machineHasIPAddress(scope.ProxmoxMachine) {
 		return nil, errors.New("machine does not yet have an ip address")
@@ -268,7 +270,6 @@ func getMachineAddresses(ctx context.Context, scope *scope.MachineScope) ([]clus
 			networkSpec.Default,
 			infrav1alpha1.DefaultNetworkDevice,
 			infrav1alpha1.IPV6Format) {
-
 		nets, err := scope.InfraCluster.ProxmoxClient.GetVMNetwork(ctx, scope.VirtualMachine)
 		if err != nil {
 			return nil, errors.Wrapf(err, "unable to get network interfaces for vm %s", scope.ProxmoxMachine.GetName())
@@ -286,7 +287,6 @@ func getMachineAddresses(ctx context.Context, scope *scope.MachineScope) ([]clus
 					}
 				}
 			}
-
 		}
 
 		setMachineAddresses(scope, &addresses, ipv4, ipv6)

internal/service/vmservice/vm_test.go

@@ -165,11 +165,11 @@ func TestReconcileVirtualMachineConfig_ApplyConfig(t *testing.T) {
 	machineScope.ProxmoxMachine.Spec.NumCores = 4
 	machineScope.ProxmoxMachine.Spec.MemoryMiB = 16 * 1024
 	machineScope.ProxmoxMachine.Spec.Network = &infrav1.NetworkSpec{
-		Default: &infrav1.NetworkDevice{Bridge: "vmbr0", Model: ptr.To("virtio")},
+		Default: &infrav1.NetworkDevice{Bridge: "vmbr0", Model: ptr.To("virtio"), MTU: ptr.To(uint16(1500))},
 		AdditionalDevices: []infrav1.AdditionalNetworkDevice{
 			{
 				Name:          "net1",
-				NetworkDevice: &infrav1.NetworkDevice{Bridge: "vmbr1", Model: ptr.To("virtio")},
+				NetworkDevice: &infrav1.NetworkDevice{Bridge: "vmbr1", Model: ptr.To("virtio"), MTU: ptr.To(uint16(1500))},
 			},
 		},
 	}

internal/webhook/proxmoxmachine_webhook.go

@@ -100,7 +100,7 @@ func validateNetworks(machine *infrav1.ProxmoxMachine) error {
 	}
 
 	for i := range machine.Spec.Network.AdditionalDevices {
-		err := validateNetworkDevice(&machine.Spec.Network.AdditionalDevices[i].NetworkDevice)
+		err := validateNetworkDevice(machine.Spec.Network.AdditionalDevices[i].NetworkDevice)
 		if err != nil {
 			return apierrors.NewInvalid(
 				gk,