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 940f7a7..aaf2071 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 @@ -28,5 +28,5 @@ inputs = { cert_manager_controller_tag = "v1.15.1" cert_manager_startupapicheck_tag = "v1.15.1" cert_manager_webhook_tag = "v1.15.1" - namespace = "cert-manager" + cluster_issuer_name = "cert-manager" } 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 db2104c..9b316e7 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 @@ -7,7 +7,7 @@ locals { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git" + 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"] 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 b9c915b..344d7d2 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 @@ -9,6 +9,9 @@ terraform { dependency "eks" { config_path = "../eks" } +dependency "eks-loki" { + config_path = "../eks-loki" +} dependency "eks-tempo" { config_path = "../eks-tempo" } diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-kiali/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-kiali/terragrunt.hcl index 5f279f4..f3c35f4 100644 --- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-kiali/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-kiali/terragrunt.hcl @@ -23,16 +23,27 @@ dependency "eks-config" { dependency "eks-cert-manager" { config_path = "../eks-cert-manager" } +dependency "eks-prometheus" { + config_path = "../eks-prometheus" +} dependency "eks-grafana" { config_path = "../eks-grafana" } inputs = { - profile = dependency.eks.inputs.profile - cluster_name = dependency.eks.inputs.cluster_name - cluster_domain = dependency.eks.inputs.vpc_domain_name - certificate_issuer = dependency.eks-cert-manager.outputs.certificate_issuer - operators_namespace = dependency.eks-config.outputs.operators_ns + certificate_issuer = dependency.eks-cert-manager.outputs.certificate_issuer + cluster_domain = dependency.eks.inputs.vpc_domain_name + cluster_name = dependency.eks.inputs.cluster_name + grafana_internal_url = dependency.eks-grafana.outputs.internal_endpoint.url + grafana_namespace = dependency.eks-grafana.outputs.namespace + grafana_public_url = dependency.eks-grafana.outputs.public_endpoint.url + grafana_secret_name = dependency.eks-grafana.outputs.secret_name + jaeger_internal_url = "" + operators_namespace = dependency.eks-config.outputs.operators_ns + profile = dependency.eks.inputs.profile + prometheus_internal_url = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.url + + # client_id = var.sso_client_id # client_secret = var.sso_client_secret # keycloak_public_url = var.keycloak_public_url diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-prometheus/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-prometheus/terragrunt.hcl index 3cd7e4d..b2b7467 100644 --- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-prometheus/terragrunt.hcl +++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-prometheus/terragrunt.hcl @@ -13,8 +13,8 @@ terraform { dependency "eks" { config_path = "../eks" } -dependency "eks-istio" { - config_path = "../eks-istio" +dependency "eks-loki" { + config_path = "../eks-loki" } inputs = {