From 58fe8cd8c40d2b56aef5b76d9d54593b2b0c76f8 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Mon, 16 Mar 2026 19:22:57 -0400 Subject: [PATCH] env fixed, add clusters folder --- {examples => clusters}/adsd-tools-dev/main.tf | 0 {examples => clusters}/csvd-dev-mcm/main.tf | 4 ++-- {examples => clusters}/csvd-lab-mcm/main.tf | 0 {examples => clusters}/csvd-mcm-common/main.tf | 0 templates/account.hcl.tf.tpl | 1 - templates/root.hcl.tf.tpl | 2 +- 6 files changed, 3 insertions(+), 4 deletions(-) rename {examples => clusters}/adsd-tools-dev/main.tf (100%) rename {examples => clusters}/csvd-dev-mcm/main.tf (93%) rename {examples => clusters}/csvd-lab-mcm/main.tf (100%) rename {examples => clusters}/csvd-mcm-common/main.tf (100%) diff --git a/examples/adsd-tools-dev/main.tf b/clusters/adsd-tools-dev/main.tf similarity index 100% rename from examples/adsd-tools-dev/main.tf rename to clusters/adsd-tools-dev/main.tf diff --git a/examples/csvd-dev-mcm/main.tf b/clusters/csvd-dev-mcm/main.tf similarity index 93% rename from examples/csvd-dev-mcm/main.tf rename to clusters/csvd-dev-mcm/main.tf index 3da1012..8ab552c 100644 --- a/examples/csvd-dev-mcm/main.tf +++ b/clusters/csvd-dev-mcm/main.tf @@ -29,8 +29,8 @@ module "eks_deployment" { finops_project_name = "csvd_platformbaseline" finops_project_number = "fs0000000078" finops_project_role = "csvd_platformbaseline_eks" - vpc_domain_name = "dev.csvd.csp1.census.gov" - vpc_name = "vpc2-csvd-dev" + vpc_domain_name = "dev.inf.csp1.census.gov" + vpc_name = "vpc3-inf-dev" tags = { Owner = "matthew.c.morgan@census.gov" Environment = "development" diff --git a/examples/csvd-lab-mcm/main.tf b/clusters/csvd-lab-mcm/main.tf similarity index 100% rename from examples/csvd-lab-mcm/main.tf rename to clusters/csvd-lab-mcm/main.tf diff --git a/examples/csvd-mcm-common/main.tf b/clusters/csvd-mcm-common/main.tf similarity index 100% rename from examples/csvd-mcm-common/main.tf rename to clusters/csvd-mcm-common/main.tf diff --git a/templates/account.hcl.tf.tpl b/templates/account.hcl.tf.tpl index b348f6b..ea432ce 100644 --- a/templates/account.hcl.tf.tpl +++ b/templates/account.hcl.tf.tpl @@ -7,5 +7,4 @@ locals { aws_account_id = "${aws_account_id}" aws_profile = format("%v-%v", local.aws_account_id, replace(local.account_name, "-ew", "-gov")) environment = "${environment}" - environment_abbr = contains(local.account_name, 'lab') ? 'lab' : contains(local.account_name, 'dev') ? 'dev' : contains(local.account_name, 'prod') ? 'prod' : 'CHANGEME' } diff --git a/templates/root.hcl.tf.tpl b/templates/root.hcl.tf.tpl index 2946d47..981f885 100644 --- a/templates/root.hcl.tf.tpl +++ b/templates/root.hcl.tf.tpl @@ -40,7 +40,7 @@ locals { aws_region = local.region_vars.locals.aws_region cluster_name = local.cluster_vars.locals.cluster_name eecr_info = local.common_vars.locals.eecr_info - environment_abbr = local.account_vars.locals.environment_abbr + environment_abbr = local.common_vars.locals.environment_abbr 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