diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-cert-manager/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-cert-manager/terragrunt.hcl index 7ce07a3..252a962 100644 --- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-cert-manager/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-cert-manager/terragrunt.hcl @@ -1,5 +1,5 @@ terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-manager.git" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-manager.git?ref=mcmCluster" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-config/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-config/terragrunt.hcl index 1767061..3d352dc 100644 --- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-config/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-config/terragrunt.hcl @@ -4,9 +4,8 @@ include "root" { locals { tag_costallocation = "census:csvd:platformbaseline" - region = "us-gov-east-1" tags = { - "eks-cluster-name" = "platform-eng-eks-mcm" + "eks-cluster-name" = ependency.eks.inputs.cluster_name "CostAllocation" = "census:csvd:platformbaseline" "boc:tf_module_version" = "1.0.0" "boc:created_by" = "terraform" @@ -36,7 +35,7 @@ inputs = { oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn tags = local.tags tag_costallocation = local.tag_costallocation - region = local.region + region = dependency.eks.inputs.region } diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl index c68f87a..62744b0 100644 --- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl @@ -15,15 +15,18 @@ dependency "eks-config" { dependency "eks-cert-manager" { config_path = "../eks-cert-manager" } +dependency "eks-loki" { + config_path = "../eks-loki" +} inputs = { profile = dependency.eks.inputs.profile cluster_name = dependency.eks.inputs.cluster_name region = dependency.eks.inputs.region cluster_domain = dependency.eks.inputs.domain - certificate_issuer = - datasources = - rwo_storage_class = dependency.eks-config. + certificate_issuer = dependency.eks-cert-manager.outputs.certificate_issuer + datasources = dependency.eks-loki.outputs.gateway_internal_endpoint + rwo_storage_class = } generate "provider-eks" {