fix: Merge tags from Fargate profiles with common tags from cluster (#…

…1159)
terraform-aws-modules · Dec 23, 2020 · 65777d0 · 65777d0
1 parent 618019e
commit 65777d0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/modules/fargate/fargate.tf b/modules/fargate/fargate.tf
@@ -20,7 +20,6 @@ resource "aws_eks_fargate_profile" "this" {
   pod_execution_role_arn = local.pod_execution_role_arn
   subnet_ids             = var.subnets
   tags                   = each.value.tags
-
   selector {
     namespace = each.value.namespace
     labels    = lookup(each.value, "labels", null)

diff --git a/modules/fargate/locals.tf b/modules/fargate/locals.tf
@@ -4,7 +4,7 @@ locals {
   pod_execution_role_name = var.create_fargate_pod_execution_role ? element(concat(aws_iam_role.eks_fargate_pod.*.name, list("")), 0) : element(concat(data.aws_iam_role.custom_fargate_iam_role.*.name, list("")), 0)
 
   fargate_profiles_expanded = { for k, v in var.fargate_profiles : k => merge(
-    { tags = var.tags },
     v,
+    { tags = merge(var.tags, lookup(v, "tags", {})) },
   ) if var.create_eks }
 }