From 8c19ae25d26eb1efd7c2dbaa4d91e94294c8b462 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Tue, 22 Oct 2024 19:42:45 -0400 Subject: [PATCH] pass the public_hostname --- .../platform-eng-eks-mcm/eks-grafana/terragrunt.hcl | 3 ++- .../eks-k8s-dashboard/terragrunt.hcl | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl index db1d518..b22fb8f 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl @@ -4,7 +4,7 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-grafana.git?ref=main" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-grafana.git?ref=service_dns" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] @@ -33,6 +33,7 @@ inputs = { region = include.root.inputs.aws_region cluster_name = dependency.eks.outputs.cluster_name cluster_domain = dependency.eks.inputs.vpc_domain_name + public_hostname = "grafana" rwo_storage_class = dependency.eks-loki.outputs.rwo_storage_class # datasources = dependency.eks-loki.outputs.gateway_internal_endpoint } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl index 4c47c63..b8308d3 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl @@ -5,7 +5,7 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-k8s-dashboard.git?ref=main" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-k8s-dashboard.git?ref=service_dns" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] @@ -16,6 +16,7 @@ dependency "eks" { config_path = "../eks" mock_outputs = { cluster_name = "a-cluster-name" + vpc_domain_name = "example.com" } } @@ -25,8 +26,11 @@ dependency "eks-loki" { } inputs = { - profile = include.root.inputs.aws_profile - region = include.root.inputs.aws_region - cluster_name = dependency.eks.outputs.cluster_name + profile = include.root.inputs.aws_profile + region = include.root.inputs.aws_region + cluster_name = dependency.eks.outputs.cluster_name + cluster_domain = dependency.eks.inputs.vpc_domain_name + public_hostname = "dashboard" + # datasources = dependency.eks-loki.outputs.gateway_internal_endpoint # k8s_dashboard_version = "v2.0.0" # NEW IDEA TO START PINNING VERSIONING OF COMPONENT TO TF MODULE VERSION }