address review comments

linode · Oct 24, 2024 · f4c826b · f4c826b
1 parent ba230a8
commit f4c826b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/api/v1alpha1/zz_generated.conversion.go b/api/v1alpha1/zz_generated.conversion.go
diff --git a/api/v1alpha2/linodevpc_types.go b/api/v1alpha2/linodevpc_types.go
@@ -53,9 +53,9 @@ type VPCSubnetCreateOptions struct {
 	Label string `json:"label,omitempty"`
 	// +optional
 	IPv4 string `json:"ipv4,omitempty"`
-	// ID is subnet id for the subnet
+	// SubnetID is subnet id for the subnet
 	// +optional
-	ID int `json:"id,omitempty"`
+	SubnetID int `json:"subnetId,omitempty"`
 }
 
 // LinodeVPCStatus defines the observed state of LinodeVPC

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_linodevpcs.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_linodevpcs.yaml
@@ -248,15 +248,15 @@ spec:
                 items:
                   description: VPCSubnetCreateOptions defines subnet options
                   properties:
-                    id:
-                      description: ID is subnet id for the subnet
-                      type: integer
                     ipv4:
                       type: string
                     label:
                       maxLength: 63
                       minLength: 3
                       type: string
+                    subnetId:
+                      description: SubnetID is subnet id for the subnet
+                      type: integer
                   type: object
                 type: array
               vpcID:

diff --git a/controller/linodemachine_controller_helpers.go b/controller/linodemachine_controller_helpers.go
@@ -408,7 +408,11 @@ func getVPCInterfaceConfig(ctx context.Context, machineScope *scope.MachineScope
 		return nil, errors.New("failed to find subnet")
 	}
 
-	subnetID := linodeVPC.Spec.Subnets[0].ID
+	subnetID := linodeVPC.Spec.Subnets[0].SubnetID
+	if subnetID == 0 {
+		return nil, errors.New("failed to find subnet as subnet id set is 0")
+	}
+
 	for i, netInterface := range interfaces {
 		if netInterface.Purpose == linodego.InterfacePurposeVPC {
 			interfaces[i].SubnetID = &subnetID

diff --git a/controller/linodemachine_controller_test.go b/controller/linodemachine_controller_test.go
@@ -1787,9 +1787,9 @@ var _ = Describe("machine in VPC", Label("machine", "VPC"), Ordered, func() {
 				Region: "us-ord",
 				Subnets: []infrav1alpha2.VPCSubnetCreateOptions{
 					{
-						IPv4:  "10.0.0.0/8",
-						ID:    1,
-						Label: "test",
+						IPv4:     "10.0.0.0/8",
+						SubnetID: 1,
+						Label:    "test",
 					},
 				},
 			},

diff --git a/controller/linodevpc_controller_helpers.go b/controller/linodevpc_controller_helpers.go
@@ -86,7 +86,7 @@ func updateVPCSpecSubnets(vpcScope *scope.VPCScope, vpc *linodego.VPC) {
 	for i, specSubnet := range vpcScope.LinodeVPC.Spec.Subnets {
 		for _, vpcSubnet := range vpc.Subnets {
 			if specSubnet.Label == vpcSubnet.Label {
-				vpcScope.LinodeVPC.Spec.Subnets[i].ID = vpcSubnet.ID
+				vpcScope.LinodeVPC.Spec.Subnets[i].SubnetID = vpcSubnet.ID
 				break
 			}
 		}