chore: comment out EKS module global tags because of terraform-aws-mo…

…dules/terraform-aws-eks#2337 Signed-off-by: Damien Duportal <[email protected]>
jenkins-infra · Dec 23, 2022 · d1350e4 · d1350e4
1 parent 2972e46
commit d1350e4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/eks-cluster.tf b/eks-cluster.tf
@@ -27,15 +27,17 @@ module "eks" {
     provider_key_arn = aws_kms_key.eks.arn
     resources        = ["secrets"]
   }
-    
+
   cluster_endpoint_public_access = true
 
-  tags = {
-    Environment        = "jenkins-infra-${terraform.workspace}"
-    GithubRepo         = "aws"
-    GithubOrg          = "jenkins-infra"
-    associated_service = "eks/${local.cluster_name}"
-  }
+  ## TODO: Uncomment when https://github.com/terraform-aws-modules/terraform-aws-eks/issues/2337 is resolved
+  # create_cluster_primary_security_group_tags = false
+  # tags = {
+  #   Environment        = "jenkins-infra-${terraform.workspace}"
+  #   GithubRepo         = "aws"
+  #   GithubOrg          = "jenkins-infra"
+  #   associated_service = "eks/${local.cluster_name}"
+  # }
 
   # VPC is defined in vpc.tf
   vpc_id = module.vpc.vpc_id

diff --git a/eks-public-cluster.tf b/eks-public-cluster.tf
@@ -34,12 +34,14 @@ module "eks-public" {
     resources        = ["secrets"]
   }
 
-  tags = {
-    Environment        = "jenkins-infra-${terraform.workspace}"
-    GithubRepo         = "aws"
-    GithubOrg          = "jenkins-infra"
-    associated_service = "eks/${local.public_cluster_name}"
-  }
+  ## TODO: Uncomment when https://github.com/terraform-aws-modules/terraform-aws-eks/issues/2337 is resolved
+  # create_cluster_primary_security_group_tags = false
+  # tags = {
+  #   Environment        = "jenkins-infra-${terraform.workspace}"
+  #   GithubRepo         = "aws"
+  #   GithubOrg          = "jenkins-infra"
+  #   associated_service = "eks/${local.public_cluster_name}"
+  # }
 
   # VPC is defined in vpc.tf
   vpc_id = module.vpc.vpc_id