From ba916c5dd38e43adfed9ca3b69951b87889fd15f Mon Sep 17 00:00:00 2001
From: mcgin314 <luther.coleman.mcginty@census.gov>
Date: Thu, 17 Apr 2025 13:57:36 -0400
Subject: [PATCH] Kiali variables cleanup

---
 .../platform-test-z/eks-kiali/terragrunt.hcl  | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-kiali/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-kiali/terragrunt.hcl
index f52dd8e..f7f12f3 100644
--- a/lab/development/us-gov-east-1/vpc/platform-test-z/eks-kiali/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-test-z/eks-kiali/terragrunt.hcl
@@ -13,16 +13,27 @@ terraform {
   }
 }
 
+dependencies {
+  paths = [
+    "../eks",
+    "../eks-dns",
+    "../eks-prometheus",
+    "../eks-tempo",
+    "../eks-grafana",
+  ]
+}
+
 dependency "eks" {
   config_path = "../eks"
   mock_outputs = {
     cluster_name = "a-cluster-name"
   }
 }
-dependency "eks-cert-manager" {
-  config_path = "../eks-cert-manager"
+dependency "eks_dns" {
+  config_path                             = "../eks-dns"
+  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
-    cluster_issuer_name = "acmpca-clusterissuer"
+    cluster_domain = "mock.example.com"
   }
 }
 dependency "eks-prometheus" {
@@ -54,7 +65,6 @@ dependency "eks-grafana" {
       url         = "https://grafana.grafana.svc.cluster.local:80/"
     }
     namespace = "grafana"
-    # public_endpoint = "https://grafana.dev.lab.csp2.census.gov:80/"
     secret_name = "grafana"
     tempo_datasource_id = "tempo"
   }
@@ -62,9 +72,8 @@ dependency "eks-grafana" {
 
 inputs = {
   profile             = include.root.inputs.aws_profile
-  cluster_domain      = "platform-test-z.dev.lab.csp2.census.gov"
+  cluster_domain      = dependency.eks_dns.outputs.cluster_domain
   cluster_name        = dependency.eks.outputs.cluster_name
-  certificate_issuer  = dependency.eks-cert-manager.outputs.cluster_issuer_name
 
   kiali_operator_version    = include.root.inputs.kiali_operator_version
   kiali_application_version = include.root.inputs.kiali_application_version
@@ -76,8 +85,7 @@ inputs = {
   grafana_namespace       = dependency.eks-grafana.outputs.namespace
   grafana_secret_name     = dependency.eks-grafana.outputs.secret_name
   grafana_internal_url    = dependency.eks-grafana.outputs.internal_endpoint.url
-  # grafana_public_url      = "https://grafana.dev.lab.csp2.census.gov" internal_endpoint
-  grafana_public_url      = "https://grafana.platform-test-z.dev.lab.csp2.census.gov"
+  grafana_service_name    = include.root.inputs.grafana_hostname
   tempo_datasource_id     = dependency.eks-grafana.outputs.tempo_datasource_id
   tempo_internal_url      = dependency.eks-tempo.outputs.tempo_internal_endpoint.url