From 3b85f622a1a22a0e22bc0892d215857eeff0bf14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20K=C3=BChn?= Date: Thu, 8 Jun 2023 15:59:29 -0400 Subject: [PATCH 1/2] Inverse tags merge order --- modules/aws-eks-self-managed-node-groups/locals.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/aws-eks-self-managed-node-groups/locals.tf b/modules/aws-eks-self-managed-node-groups/locals.tf index 69951f4cac..a5c3e8415d 100644 --- a/modules/aws-eks-self-managed-node-groups/locals.tf +++ b/modules/aws-eks-self-managed-node-groups/locals.tf @@ -76,7 +76,6 @@ locals { common_tags = merge( var.context.tags, - local.self_managed_node_group["additional_tags"], { Name = "${local.self_managed_node_group["node_group_name"]}-${var.context.eks_cluster_id}" "kubernetes.io/cluster/${var.context.eks_cluster_id}" = "owned" @@ -85,5 +84,6 @@ locals { "k8s.io/cluster-autoscaler/node-template/label/eks/capacityType" = local.self_managed_node_group["capacity_type"] "k8s.io/cluster-autoscaler/node-template/label/eks/nodegroup" = local.self_managed_node_group["node_group_name"] "managed-by" = "terraform-aws-eks-blueprints" - }) + }, + local.self_managed_node_group["additional_tags"]) } From 528e612a0908a7263d326a98c65f84b2f688616c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20K=C3=BChn?= Date: Mon, 12 Jun 2023 13:01:10 -0400 Subject: [PATCH 2/2] fmt --- modules/aws-eks-self-managed-node-groups/locals.tf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/aws-eks-self-managed-node-groups/locals.tf b/modules/aws-eks-self-managed-node-groups/locals.tf index a5c3e8415d..014829e73f 100644 --- a/modules/aws-eks-self-managed-node-groups/locals.tf +++ b/modules/aws-eks-self-managed-node-groups/locals.tf @@ -85,5 +85,6 @@ locals { "k8s.io/cluster-autoscaler/node-template/label/eks/nodegroup" = local.self_managed_node_group["node_group_name"] "managed-by" = "terraform-aws-eks-blueprints" }, - local.self_managed_node_group["additional_tags"]) + local.self_managed_node_group["additional_tags"] + ) }