address review comments

Author: rahulait

Makefile

@@ -80,7 +80,7 @@ fmt:
 .PHONY: test
 # we say code is not worth testing unless it's formatted
 test: fmt codegen
-	go test -v -coverpkg=./sentry,./cloud/linode/client,./cloud/linode/firewall,./cloud/linode,.cloud/nodeipam,.cloud/nodeipam/ipam -coverprofile ./coverage.out -cover ./sentry/... ./cloud/... $(TEST_ARGS)
+	go test -v -coverpkg=./sentry,./cloud/linode/client,./cloud/linode/firewall,./cloud/linode,./cloud/nodeipam,./cloud/nodeipam/ipam -coverprofile ./coverage.out -cover ./sentry/... ./cloud/... $(TEST_ARGS)
 
 .PHONY: build-linux
 build-linux: codegen

cloud/nodeipam/ipam/cloud_allocator.go

@@ -65,13 +65,15 @@ type cloudAllocator struct {
 	// queues are where incoming work is placed to de-dup and to allow "easy"
 	// rate limited requeues on errors
 	queue workqueue.TypedRateLimitingInterface[any]
+
+	// nodeCIDRMaskSizeIPv6 is the mask size for the IPv6 CIDR assigned to nodes.
+	nodeCIDRMaskSizeIPv6 int
 }
 
 const providerIDPrefix = "linode://"
 
 var (
-	_                    CIDRAllocator = &cloudAllocator{}
-	nodeCIDRMaskSizeIPv6               = 112
+	_ CIDRAllocator = &cloudAllocator{}
 )
 
 // NewLinodeCIDRAllocator returns a CIDRAllocator to allocate CIDRs for node
@@ -95,20 +97,17 @@ func NewLinodeCIDRAllocator(ctx context.Context, linodeClient linode.Client, cli
 		return nil, err
 	}
 
-	// set nodeCIDRMaskSizeIPv6 to the second mask size
-	// this is used to assign the nodeCIDR for ipv6 addresses
-	nodeCIDRMaskSizeIPv6 = allocatorParams.NodeCIDRMaskSizes[1]
-
 	ca := &cloudAllocator{
-		client:       client,
-		linodeClient: linodeClient,
-		clusterCIDR:  allocatorParams.ClusterCIDRs[0],
-		cidrSet:      cidrSet,
-		nodeLister:   nodeInformer.Lister(),
-		nodesSynced:  nodeInformer.Informer().HasSynced,
-		broadcaster:  eventBroadcaster,
-		recorder:     recorder,
-		queue:        workqueue.NewNamedRateLimitingQueue(workqueue.DefaultTypedControllerRateLimiter[any](), "cidrallocator_node"),
+		client:               client,
+		linodeClient:         linodeClient,
+		clusterCIDR:          allocatorParams.ClusterCIDRs[0],
+		cidrSet:              cidrSet,
+		nodeLister:           nodeInformer.Lister(),
+		nodesSynced:          nodeInformer.Informer().HasSynced,
+		broadcaster:          eventBroadcaster,
+		recorder:             recorder,
+		queue:                workqueue.NewNamedRateLimitingQueue(workqueue.DefaultTypedControllerRateLimiter[any](), "cidrallocator_node"),
+		nodeCIDRMaskSizeIPv6: allocatorParams.NodeCIDRMaskSizes[1],
 	}
 
 	if allocatorParams.ServiceCIDR != nil {
@@ -302,7 +301,7 @@ func (c *cloudAllocator) occupyCIDRs(ctx context.Context, node *v1.Node) error {
 	for idx, cidr := range node.Spec.PodCIDRs {
 		_, podCIDR, err := netutils.ParseCIDRSloppy(cidr)
 		if err != nil {
-			return fmt.Errorf("failed to parse node %s, CIDR %s", node.Name, node.Spec.PodCIDR)
+			return fmt.Errorf("failed to parse node %s, CIDR %s", node.Name, cidr)
 		}
 		// IPv6 CIDRs are allocated from node specific ranges
 		// We don't track them in the cidrSet
@@ -366,7 +365,7 @@ func (c *cloudAllocator) allocateIPv6CIDR(ctx context.Context, node *v1.Node) (*
 		return nil, fmt.Errorf("failed parsing ipv6 range %s: %w", ipv6Range, err)
 	}
 
-	mask := net.CIDRMask(nodeCIDRMaskSizeIPv6, 128)
+	mask := net.CIDRMask(c.nodeCIDRMaskSizeIPv6, 128)
 	ipv6Embedded := &net.IPNet{
 		IP:   ip.Mask(mask),
 		Mask: mask,

go.mod

@@ -25,7 +25,10 @@ require (
 	k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979
 )
 
-require sigs.k8s.io/randfill v1.0.0 // indirect
+require (
+	github.com/onsi/gomega v1.35.1 // indirect
+	sigs.k8s.io/randfill v1.0.0 // indirect
+)
 
 require (
 	cel.dev/expr v0.19.1 // indirect
@@ -96,7 +99,6 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
-	github.com/onsi/gomega v1.35.1 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
 	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
@@ -160,7 +162,7 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.33.0 // indirect
 	k8s.io/apiserver v0.33.2 // indirect
-	k8s.io/component-helpers v0.33.2 // indirect
+	k8s.io/component-helpers v0.33.2
 	k8s.io/controller-manager v0.33.2 // indirect
 	k8s.io/kms v0.33.2 // indirect
 	k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect