From d08998380661d68bf92875180a1dbb0aa05a9c79 Mon Sep 17 00:00:00 2001 From: Srini Nangunuri Date: Wed, 4 Sep 2024 13:07:40 -0400 Subject: [PATCH] updating to the latest changes --- .../cluster/eks-cert-manager/terragrunt.hcl | 20 ++++++------ .../vpc/cluster/eks-config/terragrunt.hcl | 6 +++- .../vpc/cluster/eks-grafana/terragrunt.hcl | 8 ++++- .../vpc/cluster/eks-istio/terragrunt.hcl | 2 +- .../vpc/cluster/eks-prometheus/terragrunt.hcl | 3 ++ .../vpc/cluster/eks-tempo/terragrunt.hcl | 31 +++++++++++++++++++ 6 files changed, 56 insertions(+), 14 deletions(-) create mode 100644 lab/us-gov-east-1/vpc/cluster/eks-tempo/terragrunt.hcl diff --git a/lab/us-gov-east-1/vpc/cluster/eks-cert-manager/terragrunt.hcl b/lab/us-gov-east-1/vpc/cluster/eks-cert-manager/terragrunt.hcl index 22497df..b372876 100644 --- a/lab/us-gov-east-1/vpc/cluster/eks-cert-manager/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/cluster/eks-cert-manager/terragrunt.hcl @@ -1,15 +1,13 @@ -terraform { - # source = "git@github.e.it.census.gov:terraform-modules/aws-certificates//acmpca-eks-cert-manager" - # source = "./cert-mgr.tf" - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git" - - # cluster_name = var.cluster_name - # contact_email = var.cluster_mailing_list +include "root" { + path = find_in_parent_folders() +} - # tags = merge( - # local.base_tags, - # local.common_tags - # ) +terraform { + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=mcmCluster" + extra_arguments "retry_lock" { + commands = get_terraform_commands_that_need_locking() + arguments = ["-lock-timeout=20m"] + } } dependency "eks" { diff --git a/lab/us-gov-east-1/vpc/cluster/eks-config/terragrunt.hcl b/lab/us-gov-east-1/vpc/cluster/eks-config/terragrunt.hcl index 5473373..fd54c3b 100644 --- a/lab/us-gov-east-1/vpc/cluster/eks-config/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/cluster/eks-config/terragrunt.hcl @@ -7,7 +7,7 @@ locals { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=karpenter" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=mcmCluster" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] @@ -18,6 +18,10 @@ dependency "eks" { config_path = "../eks" } +dependency "eks-karpenter" { + config_path = "../eks-karpenter" +} + inputs = { profile = dependency.eks.inputs.profile vpc_id = dependency.eks.outputs.vpc_id diff --git a/lab/us-gov-east-1/vpc/cluster/eks-grafana/terragrunt.hcl b/lab/us-gov-east-1/vpc/cluster/eks-grafana/terragrunt.hcl index c73614f..5953c1d 100644 --- a/lab/us-gov-east-1/vpc/cluster/eks-grafana/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/cluster/eks-grafana/terragrunt.hcl @@ -23,11 +23,17 @@ remote_state { dependency "eks" { config_path = "../eks" } +dependency "eks-loki" { + config_path = "../eks-loki" +} +dependency "eks-tempo" { + config_path = "../eks-tempo" +} inputs = { profile = dependency.eks.inputs.profile cluster_name = dependency.eks.inputs.cluster_name - cluster_domain = dependency.eks.inputs.domain + cluster_domain = dependency.eks.inputs.vpc_domain_name certificate_issuer = "clusterissuer" region = "us-gov-east-1" rwo_storage_class = "gp3-encrypted" diff --git a/lab/us-gov-east-1/vpc/cluster/eks-istio/terragrunt.hcl b/lab/us-gov-east-1/vpc/cluster/eks-istio/terragrunt.hcl index fa25f52..3a75068 100644 --- a/lab/us-gov-east-1/vpc/cluster/eks-istio/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/cluster/eks-istio/terragrunt.hcl @@ -3,7 +3,7 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git?ref=1.0.4" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] diff --git a/lab/us-gov-east-1/vpc/cluster/eks-prometheus/terragrunt.hcl b/lab/us-gov-east-1/vpc/cluster/eks-prometheus/terragrunt.hcl index 8fd3870..04ebf87 100644 --- a/lab/us-gov-east-1/vpc/cluster/eks-prometheus/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/cluster/eks-prometheus/terragrunt.hcl @@ -23,6 +23,9 @@ remote_state { dependency "eks" { config_path = "../eks" } +dependency "eks-loki" { + config_path = "../eks-loki" +} inputs = { profile = dependency.eks.inputs.profile diff --git a/lab/us-gov-east-1/vpc/cluster/eks-tempo/terragrunt.hcl b/lab/us-gov-east-1/vpc/cluster/eks-tempo/terragrunt.hcl new file mode 100644 index 0000000..c405b56 --- /dev/null +++ b/lab/us-gov-east-1/vpc/cluster/eks-tempo/terragrunt.hcl @@ -0,0 +1,31 @@ +include "root" { + path = find_in_parent_folders() +} + +locals { + tag_costallocation = "census:csvd:platformbaseline" +} + +terraform { + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-tempo.git?ref=mcmCluster" + extra_arguments "retry_lock" { + commands = get_terraform_commands_that_need_locking() + arguments = ["-lock-timeout=20m"] + } +} + +dependency "eks" { + config_path = "../eks" +} + +dependency "eks-prometheus" { + config_path = "../eks-prometheus" +} + +inputs = { + profile = dependency.eks.inputs.profile + region = dependency.eks.inputs.region + cluster_name = dependency.eks.inputs.cluster_name + prometheus_port = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.port_number + prometheus_namespace = dependency.eks-prometheus.outputs.prometheus_namespace +} \ No newline at end of file