Merge pull request #8635 from hakman/kops-eks-additional-subnets

k8s-ci-robot · web-flow · commit f7d330a88fc8 · 2025-10-12T21:42:55.000-07:00
AWS: Add private subnets the kOps CI cluster
diff --git a/infra/aws/terraform/kops-infra-ci/locals.tf b/infra/aws/terraform/kops-infra-ci/locals.tf
@@ -29,8 +29,10 @@ locals {
     "k8s.io/cluster-autoscaler/enabled"               = true
   }
 
-  partition       = cidrsubnets(aws_vpc_ipam_preview_next_cidr.main.cidr, 2, 2, 2)
+  partition       = cidrsubnets(aws_vpc_ipam_preview_next_cidr.main.cidr, 2, 2, 2, 2)
   azs             = slice(data.aws_availability_zones.available.names, 0, 3)
-  private_subnets = cidrsubnets(local.partition[0], 2, 2, 2)
+  private_subnets1 = cidrsubnets(local.partition[0], 2, 2, 2, 2)
+  private_subnets2 = cidrsubnets(local.partition[2], 2, 2, 2, 2)
+  private_subnets3 = cidrsubnets(local.partition[3], 2, 2, 2, 2)
   public_subnets  = cidrsubnets(local.partition[1], 2, 2, 2)
 }
diff --git a/infra/aws/terraform/kops-infra-ci/vpc.tf b/infra/aws/terraform/kops-infra-ci/vpc.tf
@@ -74,7 +74,7 @@ module "vpc" {
   ipv4_ipam_pool_id = aws_vpc_ipam_pool.main.id
 
   azs             = local.azs
-  private_subnets = local.private_subnets
+  private_subnets = concat(local.private_subnets1, local.private_subnets2, local.private_subnets3)
   public_subnets  = local.public_subnets
 
   enable_nat_gateway     = true

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,10 @@ locals {`
`29`	`29`	`"k8s.io/cluster-autoscaler/enabled" = true`
`30`	`30`	`}`
`31`	`31`
`32`		`- partition = cidrsubnets(aws_vpc_ipam_preview_next_cidr.main.cidr, 2, 2, 2)`
	`32`	`+ partition = cidrsubnets(aws_vpc_ipam_preview_next_cidr.main.cidr, 2, 2, 2, 2)`
`33`	`33`	`azs = slice(data.aws_availability_zones.available.names, 0, 3)`
`34`		`- private_subnets = cidrsubnets(local.partition[0], 2, 2, 2)`
	`34`	`+ private_subnets1 = cidrsubnets(local.partition[0], 2, 2, 2, 2)`
	`35`	`+ private_subnets2 = cidrsubnets(local.partition[2], 2, 2, 2, 2)`
	`36`	`+ private_subnets3 = cidrsubnets(local.partition[3], 2, 2, 2, 2)`
`35`	`37`	`public_subnets = cidrsubnets(local.partition[1], 2, 2, 2)`
`36`	`38`	`}`