use ipv6 range allocated to node to calculate /112 for node ipam

Author: Rahul Sharma

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 -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/linode/client/client.go

@@ -26,6 +26,7 @@ type Client interface {
 	GetInstance(context.Context, int) (*linodego.Instance, error)
 	ListInstances(context.Context, *linodego.ListOptions) ([]linodego.Instance, error)
 	CreateInstance(ctx context.Context, opts linodego.InstanceCreateOptions) (*linodego.Instance, error)
+	ListInstanceConfigs(ctx context.Context, linodeID int, opts *linodego.ListOptions) ([]linodego.InstanceConfig, error)
 
 	GetInstanceIPAddresses(context.Context, int) (*linodego.InstanceIPAddressResponse, error)
 	AddInstanceIPAddress(ctx context.Context, linodeID int, public bool) (*linodego.InstanceIP, error)

cloud/linode/client/client_with_metrics.go

@@ -20,6 +20,7 @@ func TestNewCloudRouteControllerDisabled(t *testing.T) {
 	t.Setenv("LINODE_API_TOKEN", "dummyapitoken")
 	t.Setenv("LINODE_REGION", "us-east")
 	t.Setenv("LINODE_REQUEST_TIMEOUT_SECONDS", "10")
+	t.Setenv("LINODE_URL", "https://api.linode.com/v4")
 
 	t.Run("should not fail if vpc is empty and routecontroller is disabled", func(t *testing.T) {
 		Options.VPCName = ""
@@ -44,6 +45,7 @@ func TestNewCloud(t *testing.T) {
 	t.Setenv("LINODE_REGION", "us-east")
 	t.Setenv("LINODE_REQUEST_TIMEOUT_SECONDS", "10")
 	t.Setenv("LINODE_ROUTES_CACHE_TTL_SECONDS", "60")
+	t.Setenv("LINODE_URL", "https://api.linode.com/v4")
 	Options.LinodeGoDebug = true
 
 	t.Run("should fail if api token is empty", func(t *testing.T) {

cloud/linode/client/mocks/mock_client.go

@@ -27,7 +27,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	v1 "k8s.io/client-go/informers/core/v1"
 	"k8s.io/client-go/kubernetes"
-	cloudprovider "k8s.io/cloud-provider"
 	netutils "k8s.io/utils/net"
 
 	nodeipamcontroller "github.com/linode/linode-cloud-controller-manager/cloud/nodeipam"
@@ -45,7 +44,7 @@ var (
 	defaultNodeMaskCIDRIPv6 = 112
 )
 
-func startNodeIpamController(stopCh <-chan struct{}, cloud cloudprovider.Interface, nodeInformer v1.NodeInformer, kubeclient kubernetes.Interface) error {
+func startNodeIpamController(stopCh <-chan struct{}, cloud *linodeCloud, nodeInformer v1.NodeInformer, kubeclient kubernetes.Interface) error {
 	var serviceCIDR *net.IPNet
 	var secondaryServiceCIDR *net.IPNet
 
@@ -72,35 +71,6 @@ func startNodeIpamController(stopCh <-chan struct{}, cloud cloudprovider.Interfa
 		return fmt.Errorf("clusterCIDR %s is not ipv4", clusterCIDRs[0].String())
 	}
 
-	/* TODO: uncomment and fix if we want to support service cidr overlap with nodecidr
-	// service cidr processing
-	if len(strings.TrimSpace(nodeIPAMConfig.ServiceCIDR)) != 0 {
-		_, serviceCIDR, err = netutils.ParseCIDRSloppy(nodeIPAMConfig.ServiceCIDR)
-		if err != nil {
-			klog.ErrorS(err, "Unsuccessful parsing of service CIDR", "CIDR", nodeIPAMConfig.ServiceCIDR)
-		}
-	}
-
-	if len(strings.TrimSpace(nodeIPAMConfig.SecondaryServiceCIDR)) != 0 {
-		_, secondaryServiceCIDR, err = netutils.ParseCIDRSloppy(nodeIPAMConfig.SecondaryServiceCIDR)
-		if err != nil {
-			klog.ErrorS(err, "Unsuccessful parsing of service CIDR", "CIDR", nodeIPAMConfig.SecondaryServiceCIDR)
-		}
-	}
-
-	// the following checks are triggered if both serviceCIDR and secondaryServiceCIDR are provided
-	if serviceCIDR != nil && secondaryServiceCIDR != nil {
-		// should be dual stack (from different IPFamilies)
-		dualstackServiceCIDR, err := netutils.IsDualStackCIDRs([]*net.IPNet{serviceCIDR, secondaryServiceCIDR})
-		if err != nil {
-			return nil, false, fmt.Errorf("failed to perform dualstack check on serviceCIDR and secondaryServiceCIDR error:%v", err)
-		}
-		if !dualstackServiceCIDR {
-			return nil, false, fmt.Errorf("serviceCIDR and secondaryServiceCIDR are not dualstack (from different IPfamiles)")
-		}
-	}
-	*/
-
 	nodeCIDRMaskSizes := setNodeCIDRMaskSizes()
 
 	ctx := wait.ContextForChannel(stopCh)
@@ -109,6 +79,7 @@ func startNodeIpamController(stopCh <-chan struct{}, cloud cloudprovider.Interfa
 		ctx,
 		nodeInformer,
 		cloud,
+		cloud.client,
 		kubeclient,
 		clusterCIDRs,
 		serviceCIDR,

cloud/linode/cloud_test.go

@@ -28,7 +28,6 @@ import (
 	v1 "k8s.io/client-go/informers/core/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/fake"
-	cloudprovider "k8s.io/cloud-provider"
 )
 
 func Test_setNodeCIDRMaskSizes(t *testing.T) {
@@ -127,7 +126,7 @@ func Test_processCIDRs(t *testing.T) {
 func Test_startNodeIpamController(t *testing.T) {
 	type args struct {
 		stopCh            <-chan struct{}
-		cloud             cloudprovider.Interface
+		cloud             linodeCloud
 		nodeInformer      v1.NodeInformer
 		kubeclient        kubernetes.Interface
 		allocateNodeCIDRs bool
@@ -143,7 +142,7 @@ func Test_startNodeIpamController(t *testing.T) {
 			name: "allocate-node-cidrs not set",
 			args: args{
 				stopCh:            make(<-chan struct{}),
-				cloud:             nil,
+				cloud:             linodeCloud{},
 				nodeInformer:      nil,
 				kubeclient:        nil,
 				allocateNodeCIDRs: false,
@@ -155,7 +154,7 @@ func Test_startNodeIpamController(t *testing.T) {
 			name: "allocate-node-cidrs set but cluster-cidr not set",
 			args: args{
 				stopCh:            make(<-chan struct{}),
-				cloud:             nil,
+				cloud:             linodeCloud{},
 				nodeInformer:      nil,
 				kubeclient:        nil,
 				allocateNodeCIDRs: true,
@@ -167,7 +166,7 @@ func Test_startNodeIpamController(t *testing.T) {
 			name: "incorrect cluster-cidr specified",
 			args: args{
 				stopCh:            make(<-chan struct{}),
-				cloud:             nil,
+				cloud:             linodeCloud{},
 				nodeInformer:      nil,
 				kubeclient:        nil,
 				allocateNodeCIDRs: true,
@@ -179,7 +178,7 @@ func Test_startNodeIpamController(t *testing.T) {
 			name: "ipv6 cidr specified",
 			args: args{
 				stopCh:            make(<-chan struct{}),
-				cloud:             nil,
+				cloud:             linodeCloud{},
 				nodeInformer:      nil,
 				kubeclient:        nil,
 				allocateNodeCIDRs: true,
@@ -191,7 +190,7 @@ func Test_startNodeIpamController(t *testing.T) {
 			name: "more than one cidr specified",
 			args: args{
 				stopCh:            make(<-chan struct{}),
-				cloud:             nil,
+				cloud:             linodeCloud{},
 				nodeInformer:      nil,
 				kubeclient:        nil,
 				allocateNodeCIDRs: true,
@@ -203,7 +202,7 @@ func Test_startNodeIpamController(t *testing.T) {
 			name: "correct cidrs specified",
 			args: args{
 				stopCh:            make(<-chan struct{}),
-				cloud:             nil,
+				cloud:             linodeCloud{},
 				nodeInformer:      informers.NewSharedInformerFactory(kubeClient, 0).Core().V1().Nodes(),
 				kubeclient:        kubeClient,
 				allocateNodeCIDRs: true,
@@ -222,7 +221,7 @@ func Test_startNodeIpamController(t *testing.T) {
 		Options.AllocateNodeCIDRs = tt.args.allocateNodeCIDRs
 		Options.ClusterCIDRIPv4 = tt.args.clusterCIDR
 		t.Run(tt.name, func(t *testing.T) {
-			if err := startNodeIpamController(tt.args.stopCh, tt.args.cloud, tt.args.nodeInformer, tt.args.kubeclient); (err != nil) != tt.wantErr {
+			if err := startNodeIpamController(tt.args.stopCh, &tt.args.cloud, tt.args.nodeInformer, tt.args.kubeclient); (err != nil) != tt.wantErr {
 				t.Errorf("startNodeIpamController() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})

cloud/linode/nodeipamcontroller.go

@@ -32,6 +32,8 @@ import (
 	cloudprovider "k8s.io/cloud-provider"
 	"k8s.io/klog/v2"
 	"k8s.io/kubernetes/pkg/controller/nodeipam/ipam/cidrset"
+
+	"github.com/linode/linode-cloud-controller-manager/cloud/linode/client"
 )
 
 // CIDRAllocatorType is the type of the allocator to use.
@@ -94,15 +96,15 @@ type CIDRAllocatorParams struct {
 }
 
 // New creates a new CIDR range allocator.
-func New(ctx context.Context, kubeClient clientset.Interface, cloud cloudprovider.Interface, nodeInformer informers.NodeInformer, allocatorType CIDRAllocatorType, allocatorParams CIDRAllocatorParams) (CIDRAllocator, error) {
+func New(ctx context.Context, linodeClient client.Client, kubeClient clientset.Interface, cloud cloudprovider.Interface, nodeInformer informers.NodeInformer, allocatorType CIDRAllocatorType, allocatorParams CIDRAllocatorParams) (CIDRAllocator, error) {
 	nodeList, err := listNodes(ctx, kubeClient)
 	if err != nil {
 		return nil, err
 	}
 
 	switch allocatorType {
 	case CloudAllocatorType:
-		return NewLinodeCIDRAllocator(ctx, kubeClient, nodeInformer, allocatorParams, nodeList)
+		return NewLinodeCIDRAllocator(ctx, linodeClient, kubeClient, nodeInformer, allocatorParams, nodeList)
 	case RangeAllocatorType:
 		return nil, fmt.Errorf("RangeAllocatorType is not supported")
 	default: