allow importing subnets with IPv6 only

eksctl-io · Dec 10, 2024 · 940792f · 940792f
1 parent ee838d8
commit 940792f
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 11 deletions.
diff --git a/pkg/apis/eksctl.io/v1alpha5/vpc.go b/pkg/apis/eksctl.io/v1alpha5/vpc.go
@@ -307,7 +307,8 @@ func validateLocalConfigAgainstRemote(localSubnetsConfig AZSubnetMapping, remote
 		if localSubnet.ID != "" && localSubnet.ID != remoteSubnet.ID {
 			return "", fmt.Errorf("subnet ID %q, found in config file, is not the same as subnet ID %q, found in remote VPC config", localSubnet.ID, remoteSubnet.ID)
 		}
-		if localSubnet.CIDR.String() != "" && localSubnet.CIDR.String() != remoteSubnet.CIDR.String() {
+		if localSubnet.CIDR.String() != "" && remoteSubnet.CIDR.String() != "" &&
+			localSubnet.CIDR.String() != remoteSubnet.CIDR.String() {
 			return "", fmt.Errorf("subnet CIDR %q, found in config file, is not the same as subnet CIDR %q, found in remote VPC config", localSubnet.CIDR.String(), remoteSubnet.CIDR.String())
 		}
 		return subnetAlias, nil
@@ -347,15 +348,17 @@ func validateLocalConfigAgainstRemote(localSubnetsConfig AZSubnetMapping, remote
 }
 
 func remoteSubnetToAZSubnetSpec(subnet *ec2types.Subnet) (AZSubnetSpec, error) {
-	subnetCIDR, err := ipnet.ParseCIDR(*subnet.CidrBlock)
-	if err != nil {
-		return AZSubnetSpec{}, fmt.Errorf("unexpected error parsing subnet CIDR %q: %w", *subnet.CidrBlock, err)
+	subnetSpec := AZSubnetSpec{
+		ID: *subnet.SubnetId,
+		AZ: *subnet.AvailabilityZone,
 	}
 
-	subnetSpec := AZSubnetSpec{
-		ID:   *subnet.SubnetId,
-		AZ:   *subnet.AvailabilityZone,
-		CIDR: subnetCIDR,
+	if subnet.CidrBlock != nil {
+		subnetCIDR, err := ipnet.ParseCIDR(*subnet.CidrBlock)
+		if err != nil {
+			return AZSubnetSpec{}, fmt.Errorf("unexpected error parsing subnet CIDR %q: %w", *subnet.CidrBlock, err)
+		}
+		subnetSpec.CIDR = subnetCIDR
 	}
 
 	if subnet.OutpostArn != nil {

diff --git a/pkg/apis/eksctl.io/v1alpha5/vpc_test.go b/pkg/apis/eksctl.io/v1alpha5/vpc_test.go
@@ -30,11 +30,14 @@ type subnetCase struct {
 var _ = Describe("VPC Configuration", func() {
 	DescribeTable("Subnet import",
 		func(e subnetCase) {
-			err := ImportSubnet(e.subnets, e.localSubnetsConfig, &ec2types.Subnet{
+			ec2Subnet := ec2types.Subnet{
 				AvailabilityZone: aws.String(e.az),
 				SubnetId:         aws.String(e.subnetID),
-				CidrBlock:        aws.String(e.cidr),
-			}, func(subnet *ec2types.Subnet) string {
+			}
+			if len(e.cidr) > 0 {
+				ec2Subnet.CidrBlock = aws.String(e.cidr)
+			}
+			err := ImportSubnet(e.subnets, e.localSubnetsConfig, &ec2Subnet, func(subnet *ec2types.Subnet) string {
 				return *subnet.AvailabilityZone
 			})
 			if e.err != "" {
@@ -77,6 +80,22 @@ var _ = Describe("VPC Configuration", func() {
 				},
 			}),
 		}),
+		Entry("Existing subnets w/o IPv4 CIDR", subnetCase{
+			subnets: AZSubnetMappingFromMap(map[string]AZSubnetSpec{
+				"us-east-1a": {},
+			}),
+			localSubnetsConfig: AZSubnetMappingFromMap(map[string]AZSubnetSpec{
+				"us-east-1a": {},
+			}),
+			az:       "us-east-1a",
+			subnetID: "subnet-1",
+			expected: AZSubnetMappingFromMap(map[string]AZSubnetSpec{
+				"us-east-1a": {
+					AZ: "us-east-1a",
+					ID: "subnet-1",
+				},
+			}),
+		}),
 		Entry("Existing subnet with ID", subnetCase{
 			subnets: AZSubnetMappingFromMap(map[string]AZSubnetSpec{
 				"us-east-1a": {