From 99fd157a17c3a60e6f2461934d645cc360814392 Mon Sep 17 00:00:00 2001 From: Matthew Creal Morgan Date: Fri, 24 Jul 2026 11:32:03 -0700 Subject: [PATCH] update tags specifications, move tags.yml gen to root.hcl (#50) --- main.tf | 15 +++++++-------- tags.tf | 3 ++- tags.yml | 5 ----- 3 files changed, 9 insertions(+), 14 deletions(-) delete mode 100644 tags.yml diff --git a/main.tf b/main.tf index 7e9a991..270599d 100644 --- a/main.tf +++ b/main.tf @@ -11,11 +11,15 @@ locals { "172.16.0.0/12", "192.168.0.0/16"]) filtered_endpoint_public_access_cidrs = distinct([for cidr in var.census_private_cidr : cidr if ! contains(local.disallowed_public_endpoint_cidrs, lower(trimspace(cidr)))]) + tags = merge( + module.tags.tags, + { "kubernetes.io/cluster/${var.cluster_name}" = "owned" }, + { "boc:created-by" = "launch-template" } + ) } resource "terraform_data" "subnet_validation" { count = length(local.subnets) >= 2 ? 0 : "fail" - lifecycle { precondition { condition = length(local.subnets) >= 2 @@ -89,13 +93,8 @@ module "cluster" { labels = { "karpenter.sh/controller" = "true" } - tag_specifications = ["instance", "volume"] - tags = merge( - module.tags.tags, - { - "kubernetes.io/cluster/${var.cluster_name}" = "owned" - } - ) + tag_specifications = ["instance", "volume", "network-interface"] + tags = local.tags } } } diff --git a/tags.tf b/tags.tf index 7ed73e0..d94339b 100644 --- a/tags.tf +++ b/tags.tf @@ -1,6 +1,7 @@ module "tags" { # tflint-ignore: terraform_module_pinned_source - source = "git@github.e.it.census.gov:terraform-modules/boc-nts//tags" + source = "git@github.e.it.census.gov:terraform-modules/boc-nts//tags" + # tags.yml will be generated via terragrunt in root.hcl filename = format("%v/%v", path.root, "tags.yml") } diff --git a/tags.yml b/tags.yml deleted file mode 100644 index 18fa5e4..0000000 --- a/tags.yml +++ /dev/null @@ -1,5 +0,0 @@ -finops: - number: tonumber(regex("[0-9]+$", var.finops_project_number)) - name: "${var.finops_project_name}" - roles: - - eks