From 6d39cfa4753cc9a3aa17d0e1b2cb2c6c6a6b6732 Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Mon, 30 Mar 2026 14:09:15 -0400
Subject: [PATCH] update tag handling and gen

---
 clusters/csvd-dev-mcm/main.tf         |  2 +-
 main.tf                               |  5 +++--
 templates/default-versions.hcl.tf.tpl |  4 +++-
 templates/root.hcl.tf.tpl             |  2 +-
 variables.tf                          | 11 ++++++++---
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/clusters/csvd-dev-mcm/main.tf b/clusters/csvd-dev-mcm/main.tf
index ef49d30..1ce382f 100644
--- a/clusters/csvd-dev-mcm/main.tf
+++ b/clusters/csvd-dev-mcm/main.tf
@@ -33,7 +33,7 @@ module "eks_deployment" {
     tags = {
       Owner       = "matthew.c.morgan@census.gov"
       Environment = "development"
-      CostCenter  = "fs0000000078"
+      CostAllocation  = "census:ocio:csvd"
     }
     organization = "census:ocio:csvd"
   }
diff --git a/main.tf b/main.tf
index c7f8752..e28f430 100644
--- a/main.tf
+++ b/main.tf
@@ -58,10 +58,10 @@ locals {
         eks_ng_max_size        = local.eks_defaults.ng_max_size
         eks_ng_min_size        = local.eks_defaults.ng_min_size
         organization           = var.cluster_config.organization
-        CostAllocation         = var.cluster_config.organization
         finops_project_name    = local.organization_defaults.finops_project_name
         finops_project_number  = local.organization_defaults.finops_project_number
         finops_project_role    = local.organization_defaults.finops_project_role
+        CostAllocation         = var.cluster_config.organization
         tags                   = var.cluster_config.tags
       }
       modules = var.enable_modules
@@ -97,8 +97,9 @@ locals {
       finops_project_name                      = local.organization_defaults.finops_project_name,
       finops_project_number                    = local.organization_defaults.finops_project_number,
       finops_project_role                      = local.organization_defaults.finops_project_role,
-      tags                                     = var.cluster_config.tags,
+      CostAllocation                           = var.cluster_config.organization,
       organization                             = var.cluster_config.organization,
+      tags                                     = var.cluster_config.tags,
       module_enablement_overrides              = var.enable_modules
     }),
     "README.md" : templatefile("${path.module}/templates/README.md.tf.tpl", {
diff --git a/templates/default-versions.hcl.tf.tpl b/templates/default-versions.hcl.tf.tpl
index 6fcf1e3..6297366 100644
--- a/templates/default-versions.hcl.tf.tpl
+++ b/templates/default-versions.hcl.tf.tpl
@@ -31,6 +31,7 @@ locals {
       "eks-prometheus"     = "0.1.4"
       "eks-tempo"          = "0.1.4"
       "eks"                = "1.0.10"
+      "cluster"            = "2025.20.04"
     }
     "2026.03.15" = {
       "eks-arcgis"         = false
@@ -49,7 +50,8 @@ locals {
       "eks-postgresql"     = false
       "eks-prometheus"     = "0.1.5"
       "eks-tempo"          = "0.1.6"
-      "eks"                = "1.0.12"
+      "eks"                = "1.0.14"
+      "cluster"            = "2026.03.15"
     }
   }
 
diff --git a/templates/root.hcl.tf.tpl b/templates/root.hcl.tf.tpl
index d4f7bf1..06f688d 100644
--- a/templates/root.hcl.tf.tpl
+++ b/templates/root.hcl.tf.tpl
@@ -44,7 +44,7 @@ locals {
   finops_project_name   = local.cluster_vars.locals.finops_project_name
   finops_project_number = local.cluster_vars.locals.finops_project_number
   finops_project_role   = local.cluster_vars.locals.finops_project_role
-  is_eks_module         = local.module_name == "eks"
+  is_eks_module         = local.module_name == "eks" ? true : false
   prefixes              = local.prefix_vars.locals.prefixes
   is_module_enabled = merge(
     { for module in local.versions.locals.core_modules : module => true },
diff --git a/variables.tf b/variables.tf
index da70bfd..6f27c73 100644
--- a/variables.tf
+++ b/variables.tf
@@ -212,10 +212,15 @@ variable "namespaces" {
 variable "enable_modules" {
   description = "Map of modules to enable (internal use)"
   type = object({
-    gogatekeeper = optional(bool, false)
-    prometheus   = optional(bool, false)
+    gatekeeper   = optional(bool, false)
     grafana      = optional(bool, false)
-    istio        = optional(bool, false)
+    otel         = optional(bool, false)
+    prometheus   = optional(bool, false)
+    tempo        = optional(bool, false)
+    loki         = optional(bool, false)
+    kiali        = optional(bool, false)
+    keycloak     = optional(bool, false)
+    cribl        = optional(bool, false)
   })
   default = {}
 }