fix linting errors

Author: Rahul Sharma

cloud/linode/nodeipamcontroller.go

@@ -33,6 +33,10 @@ import (
 	netutils "k8s.io/utils/net"
 )
 
+const (
+	maxAllowedNodeCIDRs = 2
+)
+
 var (
 	// defaultNodeMaskCIDRIPv4 is default mask size for IPv4 node cidr
 	defaultNodeMaskCIDRIPv4 = 24
@@ -52,7 +56,7 @@ func startNodeIpamController(stopCh <-chan struct{}, cloud cloudprovider.Interfa
 	// failure: bad cidrs in config
 	clusterCIDRs, dualStack, err := processCIDRs(Options.ClusterCIDRIPv4)
 	if err != nil {
-		return fmt.Errorf("processCIDRs failed: %v", err)
+		return fmt.Errorf("processCIDRs failed: %w", err)
 	}
 
 	// failure: more than one cidr but they are not configured as dual stack
@@ -61,8 +65,8 @@ func startNodeIpamController(stopCh <-chan struct{}, cloud cloudprovider.Interfa
 	}
 
 	// failure: more than cidrs is not allowed even with dual stack
-	if len(clusterCIDRs) > 2 {
-		return fmt.Errorf("len of clusters is:%v > more than max allowed of 2", len(clusterCIDRs))
+	if len(clusterCIDRs) > maxAllowedNodeCIDRs {
+		return fmt.Errorf("len of clusters is:%v > more than max allowed of %d", len(clusterCIDRs), maxAllowedNodeCIDRs)
 	}
 
 	/* TODO: uncomment and fix if we want to support service cidr overlap with nodecidr
@@ -94,10 +98,7 @@ func startNodeIpamController(stopCh <-chan struct{}, cloud cloudprovider.Interfa
 	}
 	*/
 
-	nodeCIDRMaskSizes, err := setNodeCIDRMaskSizes(clusterCIDRs)
-	if err != nil {
-		return fmt.Errorf("setNodeCIDRMaskSizes failed: %v", err)
-	}
+	nodeCIDRMaskSizes := setNodeCIDRMaskSizes(clusterCIDRs)
 
 	ctx := wait.ContextForChannel(stopCh)
 
@@ -110,7 +111,7 @@ func startNodeIpamController(stopCh <-chan struct{}, cloud cloudprovider.Interfa
 		serviceCIDR,
 		secondaryServiceCIDR,
 		nodeCIDRMaskSizes,
-		ipam.CIDRAllocatorType(ipam.RangeAllocatorType),
+		ipam.RangeAllocatorType,
 	)
 	if err != nil {
 		return err
@@ -134,12 +135,15 @@ func processCIDRs(cidrsList string) ([]*net.IPNet, bool, error) {
 
 	// if cidrs has an error then the previous call will fail
 	// safe to ignore error checking on next call
-	dualstack, _ := netutils.IsDualStackCIDRs(cidrs)
+	dualstack, err := netutils.IsDualStackCIDRs(cidrs)
+	if err != nil {
+		return nil, false, fmt.Errorf("failed to perform dualstack check on cidrs: %w", err)
+	}
 
 	return cidrs, dualstack, nil
 }
 
-func setNodeCIDRMaskSizes(clusterCIDRs []*net.IPNet) ([]int, error) {
+func setNodeCIDRMaskSizes(clusterCIDRs []*net.IPNet) []int {
 	sortedSizes := func(maskSizeIPv4, maskSizeIPv6 int) []int {
 		nodeMaskCIDRs := make([]int, len(clusterCIDRs))
 
@@ -159,5 +163,5 @@ func setNodeCIDRMaskSizes(clusterCIDRs []*net.IPNet) ([]int, error) {
 	if Options.NodeCIDRMaskSizeIPv6 != 0 {
 		defaultNodeMaskCIDRIPv6 = Options.NodeCIDRMaskSizeIPv6
 	}
-	return sortedSizes(defaultNodeMaskCIDRIPv4, defaultNodeMaskCIDRIPv6), nil
+	return sortedSizes(defaultNodeMaskCIDRIPv4, defaultNodeMaskCIDRIPv6)
 }

cloud/linode/nodeipamcontroller_test.go

@@ -24,8 +24,10 @@ import (
 	"reflect"
 	"testing"
 
+	"k8s.io/client-go/informers"
 	v1 "k8s.io/client-go/informers/core/v1"
 	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/kubernetes/fake"
 	cloudprovider "k8s.io/cloud-provider"
 )
 
@@ -38,18 +40,16 @@ func Test_setNodeCIDRMaskSizes(t *testing.T) {
 	_, ipv4Net, _ := net.ParseCIDR("10.192.0.0/10")
 	_, ipv6Net, _ := net.ParseCIDR("fd00::/56")
 	tests := []struct {
-		name    string
-		args    args
-		want    []int
-		wantErr bool
+		name string
+		args args
+		want []int
 	}{
 		{
 			name: "empty cluster cidrs",
 			args: args{
 				clusterCIDRs: []*net.IPNet{},
 			},
-			want:    []int{},
-			wantErr: false,
+			want: []int{},
 		},
 		{
 			name: "single cidr",
@@ -61,8 +61,7 @@ func Test_setNodeCIDRMaskSizes(t *testing.T) {
 					},
 				},
 			},
-			want:    []int{defaultNodeMaskCIDRIPv4},
-			wantErr: false,
+			want: []int{defaultNodeMaskCIDRIPv4},
 		},
 		{
 			name: "two cidrs",
@@ -78,8 +77,7 @@ func Test_setNodeCIDRMaskSizes(t *testing.T) {
 					},
 				},
 			},
-			want:    []int{defaultNodeMaskCIDRIPv4, defaultNodeMaskCIDRIPv6},
-			wantErr: false,
+			want: []int{defaultNodeMaskCIDRIPv4, defaultNodeMaskCIDRIPv6},
 		},
 		{
 			name: "two cidrs with custom mask sizes",
@@ -97,8 +95,7 @@ func Test_setNodeCIDRMaskSizes(t *testing.T) {
 				ipv4NetMask: 25,
 				ipv6NetMask: 80,
 			},
-			want:    []int{25, 80},
-			wantErr: false,
+			want: []int{25, 80},
 		},
 	}
 	for _, tt := range tests {
@@ -115,11 +112,7 @@ func Test_setNodeCIDRMaskSizes(t *testing.T) {
 			if tt.args.ipv6NetMask != 0 {
 				Options.NodeCIDRMaskSizeIPv6 = tt.args.ipv6NetMask
 			}
-			got, err := setNodeCIDRMaskSizes(tt.args.clusterCIDRs)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("setNodeCIDRMaskSizes() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
+			got := setNodeCIDRMaskSizes(tt.args.clusterCIDRs)
 			if !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("setNodeCIDRMaskSizes() = %v, want %v", got, tt.want)
 			}
@@ -208,6 +201,7 @@ func Test_startNodeIpamController(t *testing.T) {
 		allocateNodeCIDRs bool
 		clusterCIDR       string
 	}
+	kubeClient := fake.NewSimpleClientset()
 	tests := []struct {
 		name    string
 		args    args
@@ -261,6 +255,18 @@ func Test_startNodeIpamController(t *testing.T) {
 			},
 			wantErr: true,
 		},
+		{
+			name: "correct cidrs specified",
+			args: args{
+				stopCh:            make(<-chan struct{}),
+				cloud:             nil,
+				nodeInformer:      informers.NewSharedInformerFactory(kubeClient, 0).Core().V1().Nodes(),
+				kubeclient:        kubeClient,
+				allocateNodeCIDRs: true,
+				clusterCIDR:       "10.192.0.0/10",
+			},
+			wantErr: false,
+		},
 	}
 	for _, tt := range tests {
 		currAllocateNodeCIDRs := Options.AllocateNodeCIDRs