use providerid to get linode id

Author: Rahul Sharma

cloud/nodeipam/ipam/cloud_allocator.go

@@ -18,11 +18,13 @@ package ipam
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"net"
+	"strconv"
+	"strings"
 	"time"
 
+	"github.com/linode/linodego"
 	v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
@@ -43,7 +45,6 @@ import (
 	netutils "k8s.io/utils/net"
 
 	linode "github.com/linode/linode-cloud-controller-manager/cloud/linode/client"
-	"github.com/linode/linodego"
 )
 
 type cloudAllocator struct {
@@ -66,6 +67,8 @@ type cloudAllocator struct {
 	queue workqueue.TypedRateLimitingInterface[any]
 }
 
+const providerIDPrefix = "linode://"
+
 var (
 	_                    CIDRAllocator = &cloudAllocator{}
 	nodeCIDRMaskSizeIPv6               = 112
@@ -326,21 +329,21 @@ func (c *cloudAllocator) occupyCIDRs(ctx context.Context, node *v1.Node) error {
 // It then creates a new net.IPNet with the IPv6 address and mask size defined
 // by nodeCIDRMaskSizeIPv6. The function returns an error if it fails to retrieve
 // the instance configuration or parse the IPv6 range.
-func (c *cloudAllocator) allocateIPv6CIDR(node *v1.Node) (*net.IPNet, error) {
-	filter := map[string]string{"label": fmt.Sprintf("%s", node.Name)}
-	rawFilter, err := json.Marshal(filter)
-	if err != nil {
-		return nil, fmt.Errorf("json marshal should not have failed")
+func (c *cloudAllocator) allocateIPv6CIDR(ctx context.Context, node *v1.Node) (*net.IPNet, error) {
+	if node.Spec.ProviderID == "" {
+		return nil, fmt.Errorf("node %s has no ProviderID set, cannot calculate ipv6 range for it", node.Name)
+	}
+	// Extract the Linode ID from the ProviderID
+	if !strings.HasPrefix(node.Spec.ProviderID, providerIDPrefix) {
+		return nil, fmt.Errorf("node %s has invalid ProviderID %s, expected prefix '%s'", node.Name, node.Spec.ProviderID, providerIDPrefix)
 	}
-	linodes, err := c.linodeClient.ListInstances(context.TODO(), linodego.NewListOptions(1, string(rawFilter)))
+	// Parse the Linode ID from the ProviderID
+	id, err := strconv.Atoi(strings.TrimPrefix(node.Spec.ProviderID, providerIDPrefix))
 	if err != nil {
-		return nil, fmt.Errorf("failed to list linode instances: %w", err)
-	} else if len(linodes) == 0 {
-		return nil, fmt.Errorf("no linode instances found for node %s", node.Name)
-	} else if len(linodes) > 1 {
-		return nil, fmt.Errorf("multiple linode instances found for node %s, expected only one", node.Name)
+		return nil, fmt.Errorf("failed to parse Linode ID from ProviderID %s: %w", node.Spec.ProviderID, err)
 	}
-	configs, err := c.linodeClient.ListInstanceConfigs(context.TODO(), linodes[0].ID, &linodego.ListOptions{})
+	// 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)
 	}
@@ -393,7 +396,7 @@ func (c *cloudAllocator) AllocateOrOccupyCIDR(ctx context.Context, node *v1.Node
 		return fmt.Errorf("failed to allocate cidr from cluster cidr: %w", err)
 	}
 	allocatedCIDRs[0] = podCIDR
-	if allocatedCIDRs[1], err = c.allocateIPv6CIDR(node); err != nil {
+	if allocatedCIDRs[1], err = c.allocateIPv6CIDR(ctx, node); err != nil {
 		return fmt.Errorf("failed to assign IPv6 CIDR: %w", err)
 	}
 

cloud/nodeipam/ipam/cloud_allocator_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package ipam
 
 import (
+	"fmt"
 	"net"
 	"testing"
 	"time"
@@ -63,6 +64,9 @@ func TestOccupyPreExistingCIDR(t *testing.T) {
 						ObjectMeta: metav1.ObjectMeta{
 							Name: "node0",
 						},
+						Spec: v1.NodeSpec{
+							ProviderID: fmt.Sprintf("%s12345", providerIDPrefix),
+						},
 					},
 				},
 				Clientset: fake.NewSimpleClientset(),
@@ -90,7 +94,8 @@ func TestOccupyPreExistingCIDR(t *testing.T) {
 							Name: "node0",
 						},
 						Spec: v1.NodeSpec{
-							PodCIDRs: []string{"10.10.1.0/24"},
+							PodCIDRs:   []string{"10.10.1.0/24"},
+							ProviderID: fmt.Sprintf("%s12345", providerIDPrefix),
 						},
 					},
 				},
@@ -120,7 +125,8 @@ func TestOccupyPreExistingCIDR(t *testing.T) {
 							Name: "node0",
 						},
 						Spec: v1.NodeSpec{
-							PodCIDRs: []string{"172.10.1.0/24"},
+							PodCIDRs:   []string{"172.10.1.0/24"},
+							ProviderID: fmt.Sprintf("%s12345", providerIDPrefix),
 						},
 					},
 				},
@@ -181,6 +187,9 @@ func TestAllocateOrOccupyCIDRSuccess(t *testing.T) {
 						ObjectMeta: metav1.ObjectMeta{
 							Name: "node0",
 						},
+						Spec: v1.NodeSpec{
+							ProviderID: fmt.Sprintf("%s12345", providerIDPrefix),
+						},
 						Status: v1.NodeStatus{
 							Addresses: []v1.NodeAddress{
 								{
@@ -216,6 +225,9 @@ func TestAllocateOrOccupyCIDRSuccess(t *testing.T) {
 						ObjectMeta: metav1.ObjectMeta{
 							Name: "node0",
 						},
+						Spec: v1.NodeSpec{
+							ProviderID: fmt.Sprintf("%s12345", providerIDPrefix),
+						},
 						Status: v1.NodeStatus{
 							Addresses: []v1.NodeAddress{
 								{
@@ -255,6 +267,9 @@ func TestAllocateOrOccupyCIDRSuccess(t *testing.T) {
 						ObjectMeta: metav1.ObjectMeta{
 							Name: "node0",
 						},
+						Spec: v1.NodeSpec{
+							ProviderID: fmt.Sprintf("%s12345", providerIDPrefix),
+						},
 						Status: v1.NodeStatus{
 							Addresses: []v1.NodeAddress{
 								{
@@ -297,7 +312,8 @@ func TestAllocateOrOccupyCIDRSuccess(t *testing.T) {
 							Name: "node0",
 						},
 						Spec: v1.NodeSpec{
-							PodCIDRs: []string{"10.10.0.0/24"},
+							PodCIDRs:   []string{"10.10.0.0/24"},
+							ProviderID: fmt.Sprintf("%s12345", providerIDPrefix),
 						},
 						Status: v1.NodeStatus{
 							Addresses: []v1.NodeAddress{
@@ -313,7 +329,8 @@ func TestAllocateOrOccupyCIDRSuccess(t *testing.T) {
 							Name: "node1",
 						},
 						Spec: v1.NodeSpec{
-							PodCIDRs: []string{"10.10.2.0/24"},
+							PodCIDRs:   []string{"10.10.2.0/24"},
+							ProviderID: fmt.Sprintf("%s22345", providerIDPrefix),
 						},
 						Status: v1.NodeStatus{
 							Addresses: []v1.NodeAddress{
@@ -328,6 +345,9 @@ func TestAllocateOrOccupyCIDRSuccess(t *testing.T) {
 						ObjectMeta: metav1.ObjectMeta{
 							Name: "node2",
 						},
+						Spec: v1.NodeSpec{
+							ProviderID: fmt.Sprintf("%s32345", providerIDPrefix),
+						},
 						Status: v1.NodeStatus{
 							Addresses: []v1.NodeAddress{
 								{
@@ -361,12 +381,6 @@ func TestAllocateOrOccupyCIDRSuccess(t *testing.T) {
 	testFunc := func(tc testCase) {
 		fakeNodeInformer := test.FakeNodeInformer(tc.fakeNodeHandler)
 		nodeList, _ := tc.fakeNodeHandler.List(tCtx, metav1.ListOptions{})
-		// Initialize the range allocator.
-		tc.linodeClient.EXPECT().ListInstances(gomock.Any(), gomock.Any()).AnyTimes().Return([]linodego.Instance{
-			{
-				ID: 12345,
-			},
-		}, nil)
 		tc.linodeClient.EXPECT().ListInstanceConfigs(gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes().Return([]linodego.InstanceConfig{
 			{
 				Interfaces: []linodego.InstanceConfigInterface{
@@ -463,6 +477,9 @@ func TestAllocateOrOccupyCIDRFailure(t *testing.T) {
 						ObjectMeta: metav1.ObjectMeta{
 							Name: "node0",
 						},
+						Spec: v1.NodeSpec{
+							ProviderID: fmt.Sprintf("%s12345", providerIDPrefix),
+						},
 					},
 				},
 				Clientset: fake.NewSimpleClientset(),
@@ -572,6 +589,9 @@ func TestReleaseCIDRSuccess(t *testing.T) {
 						ObjectMeta: metav1.ObjectMeta{
 							Name: "node0",
 						},
+						Spec: v1.NodeSpec{
+							ProviderID: fmt.Sprintf("%s12345", providerIDPrefix),
+						},
 						Status: v1.NodeStatus{
 							Addresses: []v1.NodeAddress{
 								{
@@ -613,6 +633,9 @@ func TestReleaseCIDRSuccess(t *testing.T) {
 						ObjectMeta: metav1.ObjectMeta{
 							Name: "node0",
 						},
+						Spec: v1.NodeSpec{
+							ProviderID: fmt.Sprintf("%s12345", providerIDPrefix),
+						},
 						Status: v1.NodeStatus{
 							Addresses: []v1.NodeAddress{
 								{
@@ -650,12 +673,6 @@ func TestReleaseCIDRSuccess(t *testing.T) {
 	}
 	logger, tCtx := ktesting.NewTestContext(t)
 	testFunc := func(tc releaseTestCase) {
-		// Initialize the range allocator.
-		tc.linodeClient.EXPECT().ListInstances(gomock.Any(), gomock.Any()).AnyTimes().Return([]linodego.Instance{
-			{
-				ID: 12345,
-			},
-		}, nil)
 		tc.linodeClient.EXPECT().ListInstanceConfigs(gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes().Return([]linodego.InstanceConfig{
 			{
 				Interfaces: []linodego.InstanceConfigInterface{
@@ -782,8 +799,9 @@ func TestNodeDeletionReleaseCIDR(t *testing.T) {
 						Name: "node0",
 					},
 					Spec: v1.NodeSpec{
-						PodCIDR:  allocatedCIDR.String(),
-						PodCIDRs: []string{allocatedCIDR.String()},
+						PodCIDR:    allocatedCIDR.String(),
+						PodCIDRs:   []string{allocatedCIDR.String()},
+						ProviderID: fmt.Sprintf("%s12345", providerIDPrefix),
 					},
 				},
 			},
@@ -799,8 +817,9 @@ func TestNodeDeletionReleaseCIDR(t *testing.T) {
 						DeletionTimestamp: &metav1.Time{Time: time.Now()},
 					},
 					Spec: v1.NodeSpec{
-						PodCIDR:  allocatedCIDR.String(),
-						PodCIDRs: []string{allocatedCIDR.String()},
+						PodCIDR:    allocatedCIDR.String(),
+						PodCIDRs:   []string{allocatedCIDR.String()},
+						ProviderID: fmt.Sprintf("%s12345", providerIDPrefix),
 					},
 				},
 			},