fix lint

Author: AshleyDumaine

cloud/linode/route_controller.go

@@ -191,29 +191,7 @@ func (r *routes) CreateRoute(ctx context.Context, clusterName string, nameHint s
 		Range: route.DestinationCIDR,
 	})
 
-	if Options.UseLinodeInterfaces {
-		interfaceUpdateOptions := linodego.LinodeInterfaceUpdateOptions{
-			VPC: &linodego.VPCInterfaceCreateOptions{
-				IPv4: &linodego.VPCInterfaceIPv4CreateOptions{Ranges: linodeInterfaceRoutes},
-			},
-		}
-		resp, err := r.client.UpdateInterface(ctx, instance.ID, intfVPCIP.InterfaceID, interfaceUpdateOptions)
-		if err != nil {
-			return err
-		}
-		klog.V(4).Infof("Added routes for node %s. Current routes: %v", route.TargetNode, resp.VPC.IPv4.Ranges)
-	} else {
-		interfaceUpdateOptions := linodego.InstanceConfigInterfaceUpdateOptions{
-			IPRanges: &intfRoutes,
-		}
-		resp, err := r.client.UpdateInstanceConfigInterface(ctx, instance.ID, intfVPCIP.ConfigID, intfVPCIP.InterfaceID, interfaceUpdateOptions)
-		if err != nil {
-			return err
-		}
-		klog.V(4).Infof("Added routes for node %s. Current routes: %v", route.TargetNode, resp.IPRanges)
-	}
-
-	return nil
+	return r.handleInterfaces(ctx, intfRoutes, linodeInterfaceRoutes, instance, intfVPCIP, route)
 }
 
 // DeleteRoute removes route's subnet from ip_ranges of target node's VPC interface
@@ -259,6 +237,11 @@ func (r *routes) DeleteRoute(ctx context.Context, clusterName string, route *clo
 		return fmt.Errorf("unable to remove route %s for node %s. no valid interface found", route.DestinationCIDR, route.TargetNode)
 	}
 
+	return r.handleInterfaces(ctx, intfRoutes, linodeInterfaceRoutes, instance, intfVPCIP, route)
+}
+
+// handleInterfaces updates the VPC interface with adding or deleting routes
+func (r *routes) handleInterfaces(ctx context.Context, intfRoutes []string, linodeInterfaceRoutes []linodego.VPCInterfaceIPv4RangeCreateOptions, instance *linodego.Instance, intfVPCIP linodego.VPCIP, route *cloudprovider.Route) error {
 	if Options.UseLinodeInterfaces {
 		interfaceUpdateOptions := linodego.LinodeInterfaceUpdateOptions{
 			VPC: &linodego.VPCInterfaceCreateOptions{
@@ -269,7 +252,7 @@ func (r *routes) DeleteRoute(ctx context.Context, clusterName string, route *clo
 		if err != nil {
 			return err
 		}
-		klog.V(4).Infof("Deleted route for node %s. Current routes: %v", route.TargetNode, resp.VPC.IPv4.Ranges)
+		klog.V(4).Infof("Updated routes for node %s. Current routes: %v", route.TargetNode, resp.VPC.IPv4.Ranges)
 	} else {
 		interfaceUpdateOptions := linodego.InstanceConfigInterfaceUpdateOptions{
 			IPRanges: &intfRoutes,
@@ -278,7 +261,7 @@ func (r *routes) DeleteRoute(ctx context.Context, clusterName string, route *clo
 		if err != nil {
 			return err
 		}
-		klog.V(4).Infof("Deleted route for node %s. Current routes: %v", route.TargetNode, resp.IPRanges)
+		klog.V(4).Infof("Updated routes for node %s. Current routes: %v", route.TargetNode, resp.IPRanges)
 	}
 
 	return nil

cloud/nodeipam/ipam/cloud_allocator.go

@@ -373,9 +373,9 @@ func (c *cloudAllocator) allocateIPv6CIDR(ctx context.Context, node *v1.Node) (*
 	ipv6Range := ""
 	if !c.useLinodeInterfaces {
 		// Retrieve the instance configuration for the Linode ID
-		configs, err := c.linodeClient.ListInstanceConfigs(ctx, id, &linodego.ListOptions{})
-		if err != nil || len(configs) == 0 {
-			return nil, fmt.Errorf("failed to list instance configs: %w", err)
+		configs, listErr := c.linodeClient.ListInstanceConfigs(ctx, id, &linodego.ListOptions{})
+		if listErr != nil || len(configs) == 0 {
+			return nil, fmt.Errorf("failed to list instance configs: %w", listErr)
 		}
 
 		for _, iface := range configs[0].Interfaces {
@@ -391,9 +391,9 @@ func (c *cloudAllocator) allocateIPv6CIDR(ctx context.Context, node *v1.Node) (*
 			return nil, fmt.Errorf("failed to find ipv6 range in instance config: %v", configs[0])
 		}
 	} else {
-		ifaces, err := c.linodeClient.ListInterfaces(ctx, id, &linodego.ListOptions{})
-		if err != nil || len(ifaces) == 0 {
-			return nil, fmt.Errorf("failed to list interfaces: %w", err)
+		ifaces, listErr := c.linodeClient.ListInterfaces(ctx, id, &linodego.ListOptions{})
+		if listErr != nil || len(ifaces) == 0 {
+			return nil, fmt.Errorf("failed to list interfaces: %w", listErr)
 		}
 		for _, iface := range ifaces {
 			if iface.VPC != nil {