fix couple of e2e tests and use latest linodego

Author: Rahul Sharma

cloud/linode/loadbalancers_test.go

@@ -115,7 +115,10 @@ o/aoxqmE0mN1lyCPOa9UP//LlsREkWVKI3+Wld/xERtzf66hjcH+ilsXDxxpMEXo
 bSiPJQsGIKtQvyCaZY2szyOoeUGgOId+He7ITlezxKrjdj+1pLMESvAxKeo=
 -----END RSA PRIVATE KEY-----`
 
-const drop string = "DROP"
+const (
+	drop          string = "DROP"
+	defaultSubnet string = "default"
+)
 
 func TestCCMLoadBalancers(t *testing.T) {
 	testCases := []struct {
@@ -555,14 +558,14 @@ func testCreateNodeBalancerWithVPCBackend(t *testing.T, client *linodego.Client,
 		Options.SubnetNames = subnetNames
 	}()
 	Options.VPCNames = "test1"
-	Options.SubnetNames = "default"
+	Options.SubnetNames = defaultSubnet
 	_, _ = client.CreateVPC(t.Context(), linodego.VPCCreateOptions{
 		Label:       "test1",
 		Description: "",
 		Region:      "us-west",
 		Subnets: []linodego.VPCSubnetCreateOptions{
 			{
-				Label: "default",
+				Label: defaultSubnet,
 				IPv4:  "10.0.0.0/8",
 			},
 		},
@@ -597,14 +600,14 @@ func testUpdateNodeBalancerWithVPCBackend(t *testing.T, client *linodego.Client,
 		Options.SubnetNames = subnetNames
 	}()
 	Options.VPCNames = "test1"
-	Options.SubnetNames = "default"
+	Options.SubnetNames = defaultSubnet
 	_, _ = client.CreateVPC(t.Context(), linodego.VPCCreateOptions{
 		Label:       "test1",
 		Description: "",
 		Region:      "us-west",
 		Subnets: []linodego.VPCSubnetCreateOptions{
 			{
-				Label: "default",
+				Label: defaultSubnet,
 				IPv4:  "10.0.0.0/8",
 			},
 		},
@@ -684,15 +687,15 @@ func testCreateNodeBalancerWithVPCOnlySubnetFlag(t *testing.T, client *linodego.
 		Options.NodeBalancerBackendIPv4Subnet = nbBackendSubnet
 	}()
 	Options.VPCNames = "test-subflag"
-	Options.SubnetNames = "default"
+	Options.SubnetNames = defaultSubnet
 	Options.NodeBalancerBackendIPv4Subnet = "10.254.0.0/24"
 	_, _ = client.CreateVPC(t.Context(), linodego.VPCCreateOptions{
 		Label:       "test-subflag",
 		Description: "",
 		Region:      "us-west",
 		Subnets: []linodego.VPCSubnetCreateOptions{
 			{
-				Label: "default",
+				Label: defaultSubnet,
 				IPv4:  "10.0.0.0/8",
 			},
 		},
@@ -778,14 +781,14 @@ func testCreateNodeBalancerWithVPCNoFlagOrAnnotation(t *testing.T, client *linod
 		Options.SubnetNames = subnetNames
 	}()
 	Options.VPCNames = "test-noflags"
-	Options.SubnetNames = "default"
+	Options.SubnetNames = defaultSubnet
 	_, _ = client.CreateVPC(t.Context(), linodego.VPCCreateOptions{
 		Label:       "test-noflags",
 		Description: "",
 		Region:      "us-west",
 		Subnets: []linodego.VPCSubnetCreateOptions{
 			{
-				Label: "default",
+				Label: defaultSubnet,
 				IPv4:  "10.0.0.0/8",
 			},
 		},
@@ -861,14 +864,14 @@ func testCreateNodeBalancerWithVPCAnnotationOnly(t *testing.T, client *linodego.
 		Options.SubnetNames = subnetNames
 	}()
 	Options.VPCNames = "test-onlyannotation"
-	Options.SubnetNames = "default"
+	Options.SubnetNames = defaultSubnet
 	_, _ = client.CreateVPC(t.Context(), linodego.VPCCreateOptions{
 		Label:       "test-onlyannotation",
 		Description: "",
 		Region:      "us-west",
 		Subnets: []linodego.VPCSubnetCreateOptions{
 			{
-				Label: "default",
+				Label: defaultSubnet,
 				IPv4:  "10.0.0.0/8",
 			},
 			{
@@ -950,15 +953,15 @@ func testCreateNodeBalancerWithVPCOnlySubnetIDFlag(t *testing.T, client *linodeg
 		Options.NodeBalancerBackendIPv4SubnetID = nbBackendSubnetID
 	}()
 	Options.VPCNames = "test1"
-	Options.SubnetNames = "default"
+	Options.SubnetNames = defaultSubnet
 	Options.NodeBalancerBackendIPv4SubnetID = 1111
 	_, _ = client.CreateVPC(t.Context(), linodego.VPCCreateOptions{
 		Label:       "test-subid-flag",
 		Description: "",
 		Region:      "us-west",
 		Subnets: []linodego.VPCSubnetCreateOptions{
 			{
-				Label: "default",
+				Label: defaultSubnet,
 				IPv4:  "10.0.0.0/8",
 			},
 		},
@@ -1044,7 +1047,7 @@ func testCreateNodeBalancerWithVPCAnnotationOverwrite(t *testing.T, client *lino
 		Region:      "us-west",
 		Subnets: []linodego.VPCSubnetCreateOptions{
 			{
-				Label: "default",
+				Label: defaultSubnet,
 				IPv4:  "10.0.0.0/8",
 			},
 		},

e2e/test/lb-preserve-annotation-new-nb-specified/chainsaw-test.yaml

@@ -44,12 +44,29 @@ spec:
               # Create new nodebalancer and use it
               LABEL="ccm-$(head /dev/urandom | tr -dc 'a-z0-9' | head -c 5)"
 
+              # Get VPC config for the old nodebalancer if it exists
+              vpcconfig=$(curl -s \
+                -H "Authorization: Bearer $LINODE_TOKEN" \
+                -H "Content-Type: application/json" \
+                "https://api.linode.com/v4beta/nodebalancers/$old_nbid/vpcs")
+
+              echo "Nodebalancer ID: $old_nbid"
+              echo "VPC config: $vpcconfig"
+
+              SUBNET_ID=$(echo $vpcconfig | jq -r ".data[] | select(.nodebalancer_id == $old_nbid) | .subnet_id")
+              echo "Subnet ID: $SUBNET_ID"
+
+              data="{\"label\": \"$LABEL\", \"region\": \"$REGION\", \"vpcs\": [{\"subnet_id\": $SUBNET_ID}]}"
+              if [[ -z $SUBNET_ID ]]; then
+                  data="{\"label\": \"$LABEL\", \"region\": \"$REGION\"}"
+              fi
+
               nbid=$(curl -s --request POST \
                 -H "Authorization: Bearer $LINODE_TOKEN" \
                 -H "Content-Type: application/json" \
                 -H "accept: application/json" \
-                "https://api.linode.com/v4/nodebalancers" \
-                --data "{\"label\": \"$LABEL\", \"region\": \"$REGION\"}" | jq .id)
+                "https://api.linode.com/v4beta/nodebalancers" \
+                --data "$data" | jq .id)
 
               if ! [[ $nbid =~ $re ]]; then
                   echo "Nodebalancer id [$nbid] is incorrect, failed to create nodebalancer"

e2e/test/lb-updated-with-nb-id/chainsaw-test.yaml

@@ -39,12 +39,32 @@ spec:
               re='^[0-9]+$'
               LABEL="ccm-$(head /dev/urandom | tr -dc 'a-z0-9' | head -c 5)"
 
+              # Get existing nodebalancer id
+              old_nbid=$(KUBECONFIG=$KUBECONFIG NAMESPACE=$NAMESPACE LINODE_TOKEN=$LINODE_TOKEN ../scripts/get-nb-id.sh)
+
+              # Get VPC config for the old nodebalancer if it exists
+              vpcconfig=$(curl -s \
+                -H "Authorization: Bearer $LINODE_TOKEN" \
+                -H "Content-Type: application/json" \
+                "https://api.linode.com/v4beta/nodebalancers/$old_nbid/vpcs")
+
+              echo "Nodebalancer ID: $old_nbid"
+              echo "VPC config: $vpcconfig"
+
+              SUBNET_ID=$(echo $vpcconfig | jq -r ".data[] | select(.nodebalancer_id == $old_nbid) | .subnet_id")
+              echo "Subnet ID: $SUBNET_ID"
+
+              data="{\"label\": \"$LABEL\", \"region\": \"$REGION\", \"vpcs\": [{\"subnet_id\": $SUBNET_ID}]}"
+              if [[ -z $SUBNET_ID ]]; then
+                  data="{\"label\": \"$LABEL\", \"region\": \"$REGION\"}"
+              fi
+
               nbid=$(curl -s --request POST \
                 -H "Authorization: Bearer $LINODE_TOKEN" \
                 -H "Content-Type: application/json" \
                 -H "accept: application/json" \
                 "https://api.linode.com/v4/nodebalancers" \
-                --data "{\"label\": \"$LABEL\", \"region\": \"$REGION\"}" | jq .id)
+                --data "$data" | jq .id)
 
               if ! [[ $nbid =~ $re ]]; then
                   echo "Nodebalancer id [$nbid] for label [$lABEL] is incorrect, failed to create nodebalancer"

go.mod

@@ -190,5 +190,3 @@ replace (
 	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.0
 	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.0
 )
-
-replace github.com/linode/linodego => github.com/rahulait/linodego v1.50.1-0.20250522183359-5da732de45af

go.sum

@@ -201,6 +201,8 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
+github.com/linode/linodego v1.52.0 h1:SN1PSekrZBcHtRt1pADTz0JO7NX9pQv/Gf8Jc9s9l8w=
+github.com/linode/linodego v1.52.0/go.mod h1:zEN2sX+cSdp67EuRY1HJiyuLujoa7HqvVwNEcJv3iXw=
 github.com/mackerelio/go-osstat v0.2.5 h1:+MqTbZUhoIt4m8qzkVoXUJg1EuifwlAJSk4Yl2GXh+o=
 github.com/mackerelio/go-osstat v0.2.5/go.mod h1:atxwWF+POUZcdtR1wnsUcQxTytoHG4uhl2AKKzrOajY=
 github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM=
@@ -266,8 +268,6 @@ github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ
 github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
 github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
 github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
-github.com/rahulait/linodego v1.50.1-0.20250522183359-5da732de45af h1:LG/Nrmv3UyKsLqk2Juy7DJPJL+DEtef4AIeBtkYOOp8=
-github.com/rahulait/linodego v1.50.1-0.20250522183359-5da732de45af/go.mod h1:zEN2sX+cSdp67EuRY1HJiyuLujoa7HqvVwNEcJv3iXw=
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
 github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=