fix ordering

SCT-Engineering · Apr 16, 2025 · 74dc304 · 74dc304
1 parent 609d0d0
commit 74dc304
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-arcgis/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-arcgis/terragrunt.hcl
@@ -20,19 +20,28 @@ dependency "eks" {
   }
 }
 
+dependency "eks_config" {
+  config_path                             = "../eks-config"
+  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
+  mock_outputs = {
+    rwo_storage_class = "gp3-mock"
+  }
+}
+
 dependency "eks_dns" {
   config_path                             = "../eks-dns"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
-    cluster_domain = "mock.example.com"
+    cluster_domain = "mock.domain.example.com"
   }
 }
 
 dependencies {
   paths = [
     "../eks",
-    "../eks_dns",
-    "../eks_grafana",
+    "../eks-config",
+    "../eks-dns",
+    "../eks-kiali",
   ]
 }
 
@@ -57,7 +66,7 @@ inputs = {
   arcgis_license_json             = ""
   arcgis_admin_username           = "admin"
   arcgis_admin_password           = "password"
-  arcgis_admin_email              = dependency.eks.outputs.cluster_mailing_list
+  arcgis_admin_email              = include.root.inputs.cluster_mailing_list
   arcgis_admin_firstname          = "admin"
   arcgis_admin_lastname           = "admin"
   arcgis_security_question_index  = 1

diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-dns/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-dns/terragrunt.hcl
@@ -21,7 +21,7 @@ dependency "eks" {
   }
 }
 
-dependency "eks-istio" {
+dependency "eks_istio" {
   config_path                             = "../eks-istio"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
@@ -50,7 +50,7 @@ inputs = {
   cluster_name = include.root.inputs.cluster_name
 
   # Network Configuration
-  istio_ingress_lb  = dependency.eks-istio.outputs.istio_ingress_lb
+  istio_ingress_lb  = dependency.eks_istio.outputs.istio_ingress_lb
   route53_endpoints = include.root.inputs.route53_endpoints
   vpc_domain_name   = include.root.inputs.vpc_domain_name
   vpc_name          = include.root.inputs.vpc_name