From 80c4241034a581a7799aa3705cdb66d857a3cce8 Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Tue, 30 Jul 2024 19:33:50 -0400
Subject: [PATCH] works

---
 .../_mcmCluster/eks-cloudwatch/terragrunt.hcl |  3 ++
 .../vpc/_mcmCluster/eks-kiali/terragrunt.hcl  | 46 -------------------
 .../eks-metrics-server/terragrunt.hcl         |  2 +-
 .../vpc/_mcmCluster/eks-tempo/terragrunt.hcl  | 29 ------------
 4 files changed, 4 insertions(+), 76 deletions(-)
 delete mode 100644 lab/us-gov-east-1/vpc/_mcmCluster/eks-kiali/terragrunt.hcl
 delete mode 100644 lab/us-gov-east-1/vpc/_mcmCluster/eks-tempo/terragrunt.hcl

diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-cloudwatch/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-cloudwatch/terragrunt.hcl
index bb5ab28..d36a405 100644
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-cloudwatch/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-cloudwatch/terragrunt.hcl
@@ -20,6 +20,9 @@ dependency "eks" {
 dependency "eks-config" {
   config_path = "../eks-config"
 }
+dependency "eks-loki" {
+  config_path = "../eks-loki"
+}
 
 inputs = {
   cluster_name       = dependency.eks.inputs.cluster_name
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
deleted file mode 100644
index df4e93d..0000000
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-kiali/terragrunt.hcl
+++ /dev/null
@@ -1,46 +0,0 @@
-include "root" {
-  path = find_in_parent_folders()
-}
-
-locals {
-  tag_costallocation = "census:csvd:platformbaseline"
-}
-
-terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.git?ref=mcmCluster"
-  extra_arguments "retry_lock" {
-    commands  = get_terraform_commands_that_need_locking()
-    arguments = ["-lock-timeout=20m"]
-  }
-}
-
-dependency "eks" {
-  config_path = "../eks"
-}
-dependency "eks-config" {
-  config_path = "../eks-config"
-}
-dependency "eks-loki" {
-  config_path = "../eks-loki"
-}
-dependency "eks-grafana" {
-  config_path = "../eks-grafana"
-}
-dependency "eks-prometheus" {
-  config_path = "../eks-prometheus"
-}
-
-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.outputs.certificate_issuer
-  operators_namespace = dependency.eks.outputs.operators_namespace
-  # client_id                  = var.sso_client_id
-  # client_secret              = var.sso_client_secret
-  # keycloak_public_url        = var.keycloak_public_url
-  # gogatekeeper_chart_version = var.gogatekeeper_chart_version
-  # gogatekeeper_registry      = var.gogatekeeper_registry
-  # gogatekeeper_repository    = var.gogatekeeper_repository
-  # gogatekeeper_tag           = var.gogatekeeper_tag
-}
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-metrics-server/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-metrics-server/terragrunt.hcl
index 6852f7b..222d878 100644
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-metrics-server/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-metrics-server/terragrunt.hcl
@@ -21,7 +21,7 @@ dependency "eks-config" {
   config_path = "../eks-config"
 }
 dependency "eks-loki" {
-  config_path = "../eks-config"
+  config_path = "../eks-loki"
 }
 
 inputs = {
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-tempo/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-tempo/terragrunt.hcl
deleted file mode 100644
index b1f5121..0000000
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-tempo/terragrunt.hcl
+++ /dev/null
@@ -1,29 +0,0 @@
-include "root" {
-  path = find_in_parent_folders()
-}
-
-locals {
-  tag_costallocation = "census:csvd:platformbaseline"
-}
-
-terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-tempo.git?ref=mcmCluster"
-  extra_arguments "retry_lock" {
-    commands  = get_terraform_commands_that_need_locking()
-    arguments = ["-lock-timeout=20m"]
-  }
-}
-
-dependency "eks" {
-  config_path = "../eks"
-}
-dependency "eks-config" {
-  config_path = "../eks-config"
-}
-dependency "eks-loki" {
-  config_path = "../eks-loki"
-}
-
-inputs = {
-
-}