Merge pull request #43 from dduportal/fix/vpc/use-array-for-subnets

fix(vpc) order subnets with array to avoid unexpected destroy/recreate when only adding subnets
jenkins-infra · Nov 27, 2024 · 79fd7ed · 79fd7ed
2 parents d7b78fe + a54956e
commit 79fd7ed
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/locals.tf b/locals.tf
@@ -50,29 +50,32 @@ locals {
   ## VPC Setup
   vpc_cidr = "10.0.0.0/16" # cannot be less then /16 (more ips)
   # Public subnets use the first partition of the vpc_cidr (index 0)
-  vpc_public_subnets = {
-    "controller" = {
-      az = format("${local.region}%s", "b"),
+  vpc_public_subnets = [
+    {
+      name = "controller",
+      az   = format("${local.region}%s", "b"),
       # First /23 of the first subset of the VPC (split in 2)
       cidr = cidrsubnet(cidrsubnets(local.vpc_cidr, 1, 1)[0], 6, 0)
     },
-  }
+  ]
   # Public subnets use the second partition of the vpc_cidr (index 1)
-  vpc_private_subnets = {
-    "vm-agents-1" = {
-      az = format("${local.region}%s", "b"),
+  vpc_private_subnets = [
+    {
+      name = "eks-1",
+      az   = format("${local.region}%s", "b"),
+      # Second /23 of the second subset of the VPC (split in 2)
+      cidr = cidrsubnet(cidrsubnets(local.vpc_cidr, 1, 1)[1], 6, 1)
+    },
+    {
+      name = "vm-agents-1",
+      az   = format("${local.region}%s", "b"),
       # First /23 of the second subset of the VPC (split in 2)
       cidr = cidrsubnet(cidrsubnets(local.vpc_cidr, 1, 1)[1], 6, 0)
     },
-    "eks-1" = {
-      az = format("${local.region}%s", "b"),
-      # Second /23 of the second subset of the VPC (split in 2)
-      cidr = cidrsubnet(cidrsubnets(local.vpc_cidr, 1, 1)[1], 6, 1)
-    }
-    "eks-2" = {
-      az = format("${local.region}%s", "c"),
+    { name = "eks-2",
+      az   = format("${local.region}%s", "c"),
       # Third /23 of the second subset of the VPC (split in 2)
       cidr = cidrsubnet(cidrsubnets(local.vpc_cidr, 1, 1)[1], 6, 2)
     }
-  }
+  ]
 }
diff --git a/vpc.tf b/vpc.tf
@@ -21,8 +21,8 @@ module "vpc" {
   azs = [for subnet_name, subnet_data in local.vpc_private_subnets : subnet_data.az]
 
   # only private subnets for security (to control allowed outbound connections)
-  private_subnets = [for subnet_name, subnet_data in local.vpc_private_subnets : subnet_data.cidr]
-  public_subnets  = [for subnet_name, subnet_data in local.vpc_public_subnets : subnet_data.cidr]
+  private_subnets = [for subnet in local.vpc_private_subnets : subnet.cidr]
+  public_subnets  = [for subnet in local.vpc_public_subnets : subnet.cidr]
 
   public_subnet_ipv6_prefixes  = range(length(local.vpc_public_subnets))
   private_subnet_ipv6_prefixes = range(10, length(local.vpc_private_subnets) + 10)