lint fixes

Author: AshleyDumaine

clients/clients.go

@@ -23,6 +23,7 @@ type LinodeClient interface {
 	LinodePlacementGroupClient
 	LinodeFirewallClient
 	LinodeTokenClient
+	LinodeInterfacesClient
 
 	OnAfterResponse(m func(response *resty.Response) error)
 }
@@ -123,6 +124,11 @@ type LinodeFirewallClient interface {
 	DeleteFirewallDevice(ctx context.Context, firewallID, deviceID int) error
 }
 
+// LinodeInterfacesClient defines the methods that interact with Linode's Interfaces service.
+type LinodeInterfacesClient interface {
+	ListInterfaces(ctx context.Context, linodeID int, opts *linodego.ListOptions) ([]linodego.LinodeInterface, error)
+}
+
 type K8sClient interface {
 	client.Client
 }

internal/controller/linodemachine_controller_helpers.go

@@ -266,27 +266,11 @@ func buildInstanceAddrs(ctx context.Context, machineScope *scope.MachineScope, i
 	}
 
 	if machineScope.LinodeCluster.Spec.Network.UseVlan {
-		switch {
-		case machineScope.LinodeCluster.Spec.Network.UseNewNetworkInterfaces:
-			// TODO 
-		default:
-			// get the default instance config
-			configs, err := machineScope.LinodeClient.ListInstanceConfigs(ctx, instanceID, &linodego.ListOptions{})
-			if err != nil || len(configs) == 0 {
-				return nil, fmt.Errorf("list instance configs: %w", err)
-			}
-
-			// Iterate over interfaces in config and find VLAN specific ips
-			for _, iface := range configs[0].Interfaces {
-				if iface.Purpose == linodego.InterfacePurposeVLAN {
-					// vlan addresses have a /11 appended to them - we should strip it out.
-					ips = append(ips, clusterv1.MachineAddress{
-						Address: netip.MustParsePrefix(iface.IPAMAddress).Addr().String(),
-						Type:    clusterv1.MachineInternalIP,
-					})
-				}
-			}
+		vlanIps, err := handleVlanIps(ctx, machineScope, instanceID)
+		if err != nil {
+			return nil, fmt.Errorf("handle vlan ips: %w", err)
 		}
+		ips = append(ips, vlanIps...)
 	}
 
 	// if a node has private ip, store it as well
@@ -302,6 +286,46 @@ func buildInstanceAddrs(ctx context.Context, machineScope *scope.MachineScope, i
 	return ips, nil
 }
 
+func handleVlanIps(ctx context.Context, machineScope *scope.MachineScope, instanceID int) ([]clusterv1.MachineAddress, error) {
+	ips := []clusterv1.MachineAddress{}
+	switch {
+	case machineScope.LinodeCluster.Spec.Network.UseNewNetworkInterfaces:
+		ifaces, err := machineScope.LinodeClient.ListInterfaces(ctx, instanceID, &linodego.ListOptions{})
+		if err != nil || len(ifaces) == 0 {
+			return ips, fmt.Errorf("list interfaces: %w", err)
+		}
+		// Iterate over interfaces in config and find VLAN specific ips
+		for _, iface := range ifaces {
+			if iface.VLAN != nil {
+				// vlan addresses have a /11 appended to them - we should strip it out.
+				ips = append(ips, clusterv1.MachineAddress{
+					Address: netip.MustParsePrefix(*iface.VLAN.IPAMAddress).Addr().String(),
+					Type:    clusterv1.MachineInternalIP,
+				})
+			}
+		}
+	default:
+		// get the default instance config
+		configs, err := machineScope.LinodeClient.ListInstanceConfigs(ctx, instanceID, &linodego.ListOptions{})
+		if err != nil || len(configs) == 0 {
+			return ips, fmt.Errorf("list instance configs: %w", err)
+		}
+
+		// Iterate over interfaces in config and find VLAN specific ips
+		for _, iface := range configs[0].Interfaces {
+			if iface.Purpose == linodego.InterfacePurposeVLAN {
+				// vlan addresses have a /11 appended to them - we should strip it out.
+				ips = append(ips, clusterv1.MachineAddress{
+					Address: netip.MustParsePrefix(iface.IPAMAddress).Addr().String(),
+					Type:    clusterv1.MachineInternalIP,
+				})
+			}
+		}
+	}
+
+	return ips, nil
+}
+
 func linodeClusterToLinodeMachines(logger logr.Logger, tracedClient client.Client) handler.MapFunc {
 	logger = logger.WithName("LinodeMachineReconciler").WithName("linodeClusterToLinodeMachines")
 
@@ -1281,7 +1305,8 @@ func getVPCRefFromScope(machineScope *scope.MachineScope) *corev1.ObjectReferenc
 
 // configureVlanInterface adds a VLAN interface to the configuration
 func configureVlanInterface(ctx context.Context, machineScope *scope.MachineScope, createConfig *linodego.InstanceCreateOptions, logger logr.Logger) error {
-	if machineScope.LinodeCluster.Spec.Network.UseNewNetworkInterfaces {
+	switch {
+	case machineScope.LinodeCluster.Spec.Network.UseNewNetworkInterfaces:
 		iface, err := getVlanLinodeInterfaceConfig(ctx, machineScope, createConfig.LinodeInterfaces, logger)
 		if err != nil {
 			logger.Error(err, "Failed to get VLAN interface config")
@@ -1292,7 +1317,7 @@ func configureVlanInterface(ctx context.Context, machineScope *scope.MachineScop
 			// add VLAN interface as first interface
 			createConfig.LinodeInterfaces = slices.Insert(createConfig.LinodeInterfaces, 0, *iface)
 		}
-	} else {
+	default:
 		iface, err := getVlanInterfaceConfig(ctx, machineScope, createConfig.Interfaces, logger)
 		if err != nil {
 			logger.Error(err, "Failed to get VLAN interface config")