updates for mvp

SCT-Engineering · Oct 22, 2024 · 892bf95 · 892bf95
1 parent 35e3122
commit 892bf95
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 21 deletions.
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl
@@ -19,10 +19,10 @@ dependency "eks" {
   }
 }
 
-dependency "karpenter" {
-  config_path = "../eks-karpenter"
-  skip_outputs = true
-}
+# dependency "karpenter" {
+#   config_path = "../eks-karpenter"
+#   skip_outputs = true
+# }
 
 inputs = {
   cluster_name                     = dependency.eks.outputs.cluster_name

diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl
@@ -4,7 +4,7 @@ include "root" {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git?ref=module"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git?ref=main"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -21,17 +21,20 @@ dependency "eks" {
 dependency "istio" {
   config_path = "../eks-istio"
   mock_outputs = {
-    istio_namespace = "istio-namespace"
+    istio_ingress_lb = {
+      dns_name = "a1111111111111111111111111111111-2bbbbbbbbbbbbbbb.elb.us-gov-east-1.amazonaws.com"
+      zone_id = "ZABC123456DEF"
+    }
   }
 }
 
 inputs = {
-  cluster_name    = dependency.eks.inputs.cluster_name
-  istio_namespace = dependency.istio.outputs.istio_namespace
-  profile         = include.root.inputs.aws_profile
-  region          = include.root.inputs.aws_region
-  subnets         = dependency.eks.outputs.subnets
-  tags            = dependency.eks.inputs.tags
-  vpc_domain_name = dependency.eks.inputs.vpc_domain_name
-  vpc_name        = dependency.eks.inputs.vpc_name
+  cluster_name     = dependency.eks.inputs.cluster_name
+  istio_ingress_lb = dependency.istio.outputs.istio_ingress_lb
+  profile          = include.root.inputs.aws_profile
+  region           = include.root.inputs.aws_region
+  subnets          = dependency.eks.outputs.subnets
+  tags             = dependency.eks.inputs.tags
+  vpc_domain_name  = dependency.eks.inputs.vpc_domain_name
+  vpc_name         = dependency.eks.inputs.vpc_name
 }
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
@@ -4,7 +4,7 @@ include "root" {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-grafana.git"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-grafana.git?ref=main"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]

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
@@ -19,8 +19,8 @@ dependency "eks" {
   }
 }
 
-dependency "eks-dns" {
-  config_path  = "../eks-dns"
+dependency "eks-loki" {
+  config_path  = "../eks-loki"
   skip_outputs = true
 }
 

diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl
@@ -4,7 +4,7 @@ include "root" {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git?ref=main"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]

diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-loki/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-loki/terragrunt.hcl
@@ -22,6 +22,10 @@ dependency "eks-istio" {
   config_path  = "../eks-istio"
   skip_outputs = true
 }
+dependency "eks-prometheus" {
+  config_path  = "../eks-prometheus"
+  skip_outputs = true
+}
 
 inputs = {
   profile           = include.root.inputs.aws_profile

diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-prometheus/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-prometheus/terragrunt.hcl
@@ -18,8 +18,8 @@ dependency "eks" {
   }
 }
 
-dependency "eks-istio" {
-  config_path  = "../eks-istio"
+dependency "eks-dns" {
+  config_path  = "../eks-dns"
   skip_outputs = true
 }
 

diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl
@@ -4,7 +4,7 @@ include "root" {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-tempo.git"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-tempo.git?ref=main"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]