github-mirrors/terraform-aws-eks
1
0
Fork 0
mirror of https://github.com/ysoftdevs/terraform-aws-eks.git synced 2026-04-22 08:38:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lena-nfb
2020-12-23 12:08:19 +00:00
committed by GitHub
parent 618019e331
commit 65777d0a37
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/fargate/fargate.tf
View File

@@ -20,7 +20,6 @@ resource "aws_eks_fargate_profile" "this" {
pod_execution_role_arn = local.pod_execution_role_arn pod_execution_role_arn = local.pod_execution_role_arn
subnet_ids = var.subnets subnet_ids = var.subnets
tags = each.value.tags tags = each.value.tags
selector { selector {
namespace = each.value.namespace namespace = each.value.namespace
labels = lookup(each.value, "labels", null) labels = lookup(each.value, "labels", null)

2
modules/fargate/locals.tf
View File

@@ -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) 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( fargate_profiles_expanded = { for k, v in var.fargate_profiles : k => merge(
{ tags = var.tags },
v, v,
{ tags = merge(var.tags, lookup(v, "tags", {})) },
) if var.create_eks } ) if var.create_eks }
} }