fix: removed tags attribute from subnet module

clouddrove · Sep 12, 2023 · 5764cf3 · 5764cf3
1 parent 0d9acd5
commit 5764cf3
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 10 deletions.
diff --git a/_example/aws_managed/example.tf b/_example/aws_managed/example.tf
@@ -46,8 +46,15 @@ module "subnets" {
   ipv6_cidr_block     = module.vpc.ipv6_cidr_block
   enable_ipv6         = false
 
-  extra_public_tags  = { "kubernetes.io/role/elb" = "1" }
-  extra_private_tags = { "kubernetes.io/role/internal-elb" = "1" }
+  extra_public_tags = {
+    "kubernetes.io/cluster/${module.eks.cluster_name}" = "owned"
+    "kubernetes.io/role/elb"                           = "1"
+  }
+
+  extra_private_tags = {
+    "kubernetes.io/cluster/${module.eks.cluster_name}" = "owned"
+    "kubernetes.io/role/internal-elb"                  = "1"
+  }
 
   public_inbound_acl_rules = [
     {

diff --git a/_example/aws_managed_with_fargate/example.tf b/_example/aws_managed_with_fargate/example.tf
@@ -46,8 +46,15 @@ module "subnets" {
   ipv6_cidr_block     = module.vpc.ipv6_cidr_block
   enable_ipv6         = false
 
-  extra_public_tags  = { "kubernetes.io/role/elb" = "1" }
-  extra_private_tags = { "kubernetes.io/role/internal-elb" = "1" }
+  extra_public_tags = {
+    "kubernetes.io/cluster/${module.eks.cluster_name}" = "owned"
+    "kubernetes.io/role/elb"                           = "1"
+  }
+
+  extra_private_tags = {
+    "kubernetes.io/cluster/${module.eks.cluster_name}" = "owned"
+    "kubernetes.io/role/internal-elb"                  = "1"
+  }
 
   public_inbound_acl_rules = [
     {

diff --git a/_example/complete/example.tf b/_example/complete/example.tf
@@ -34,7 +34,6 @@ module "subnets" {
 
   name        = "${local.name}-subnets"
   environment = local.environment
-  tags        = local.tags
 
   nat_gateway_enabled = true
   availability_zones  = ["${local.region}a", "${local.region}b"]
@@ -44,8 +43,15 @@ module "subnets" {
   type                = "public-private"
   igw_id              = module.vpc.igw_id
 
-  extra_public_tags  = { "kubernetes.io/role/elb" = "1" }
-  extra_private_tags = { "kubernetes.io/role/internal-elb" = "1" }
+  extra_public_tags = {
+    "kubernetes.io/cluster/${module.eks.cluster_name}" = "shared"
+    "kubernetes.io/role/elb"                           = "1"
+  }
+
+  extra_private_tags = {
+    "kubernetes.io/cluster/${module.eks.cluster_name}" = "shared"
+    "kubernetes.io/role/internal-elb"                  = "1"
+  }
 
   public_inbound_acl_rules = [
     {

diff --git a/_example/self_managed/example.tf b/_example/self_managed/example.tf
@@ -34,7 +34,6 @@ module "subnets" {
 
   name                = "${local.name}-subnets"
   environment         = local.environment
-  tags                = local.tags
   nat_gateway_enabled = true
   availability_zones  = ["${local.region}a", "${local.region}b"]
   vpc_id              = module.vpc.vpc_id
@@ -43,8 +42,15 @@ module "subnets" {
   type                = "public-private"
   igw_id              = module.vpc.igw_id
 
-  extra_public_tags  = { "kubernetes.io/role/elb" = "1" }
-  extra_private_tags = { "kubernetes.io/role/internal-elb" = "1" }
+  extra_public_tags = {
+    "kubernetes.io/cluster/${module.eks.cluster_name}" = "shared"
+    "kubernetes.io/role/elb"                           = "1"
+  }
+
+  extra_private_tags = {
+    "kubernetes.io/cluster/${module.eks.cluster_name}" = "shared"
+    "kubernetes.io/role/internal-elb"                  = "1"
+  }
 
   public_inbound_acl_rules = [
     {