INFRA-350 switch to correct apply alb tags to eks cluster resources

wandb · Jan 31, 2025 · ce067d1 · ce067d1
1 parent 7af17bb
commit ce067d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/examples/public-dns-external/variables.tf b/examples/public-dns-external/variables.tf
@@ -127,7 +127,7 @@ variable "system_reserved_pid" {
 }
 
 variable "aws_loadbalancer_controller_tags" {
-  description = "(Optional) A map of AWS tags to apply to all resources managed by the load balancer controller"
+  description = "(Optional) A map of AWS tags to apply to all resources managed by load balancer and cluster"
   type        = map(string)
   default     = {}
 }
diff --git a/modules/app_eks/main.tf b/modules/app_eks/main.tf
@@ -65,7 +65,6 @@ module "eks" {
     metadata_http_put_response_hop_limit = 2
     metadata_http_tokens                 = "required",
     version                              = var.cluster_version,
-    tags                                 = local.defaultTags,
   }
 
   node_groups = {
@@ -78,12 +77,12 @@ module "eks" {
     }
   }
 
-  tags = {
+  tags = merge(jsondecode(local.defaultTags), {
     GithubRepo         = "wandb"
     GithubOrg          = "terraform-aws-wandb"
     TerraformNamespace = var.namespace
     TerraformModule    = "terraform-aws-wandb/module/app_eks"
-  }
+  })
 }
 
 resource "kubernetes_annotations" "gp2" {