diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-tempo/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-tempo/terragrunt.hcl index aa153cc..87becc7 100644 --- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-tempo/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-tempo/terragrunt.hcl @@ -25,6 +25,7 @@ inputs = { profile = dependency.eks.inputs.profile region = dependency.eks.inputs.region cluster_name = dependency.eks.inputs.cluster_name + oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn prometheus_port = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.port_number prometheus_namespace = dependency.eks-prometheus.outputs.prometheus_namespace } diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl index d7a6611..79966ad 100644 --- a/lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl @@ -9,7 +9,7 @@ locals { # In which AWS region are operations being performed account_id = local.account_vars.locals.aws_account_id vpc_name = "vpc3-lab-dev" - cluster_name = "platform-eng-ci-cd" + cluster_name = "platform-eng-eks-mcm" cluster_version = "1.30" vpc_domain_name = "dev.lab.csp2.census.gov" eks_instance_disk_size = 100 diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/terragrunt.hcl index 7f2ebd2..2886607 100644 --- a/lab/us-gov-east-1/vpc/_mcmCluster/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/_mcmCluster/terragrunt.hcl @@ -16,12 +16,12 @@ locals { # Extract the variables we need for easy access account_id = local.account_vars.locals.aws_account_id account_name = local.account_vars.locals.account_name - creator = "ahmed.m.youssef@census.gov" + creator = "matthew.c.morgan@census.gov" organization = "census:ocio:csvd" profile = "224384469011-lab-dev-gov" project_name = "csvd_platformbaseline" project_number = "fs0000000078" - project_role = "csvd_platformbaseline_cicd" + project_role = "csvd_platformbaseline_mcm" region = local.region_vars.locals.aws_region state_bucket_prefix = "inf-tfstate" state_table_name = "tf_remote_state" @@ -75,17 +75,14 @@ remote_state { if_exists = "overwrite_terragrunt" } config = { - #--- - # "${local.account_name}": "${get_path_from_repo_root()}" - #--- bucket = "${local.state_bucket_prefix}-${local.account_id}" - profile = "${local.profile}" + dynamodb_table = "${local.state_table_name}" key = "${trimprefix(replace(run_cmd("realpath", get_original_terragrunt_dir()), dirname(get_repo_root()), ""), "/")}" + profile = "${local.profile}" region = "${local.region}" - dynamodb_table = "${local.state_table_name}" + skip_bucket_enforced_tls = true skip_bucket_root_access = true skip_bucket_ssencryption = true - skip_bucket_enforced_tls = true } }