module_providers

lab/us-gov-east-1/vpc/_mcmCluster/eks-cert-manager/terragrunt.hcl

@@ -2,12 +2,8 @@ include "root" {
   path = find_in_parent_folders()
 }
 
-locals {
-  providers = ["kubernetes", "helm"]
-}
-
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=mcmCluster"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]

lab/us-gov-east-1/vpc/_mcmCluster/eks-cloudwatch/terragrunt.hcl

@@ -4,11 +4,10 @@ include "root" {
 
 locals {
   tag_costallocation = "census:csvd:platformbaseline"
-  providers = ["kubernetes", "helm"]
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cloudwatch.git"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cloudwatch.git?ref=mcmCluster"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]

lab/us-gov-east-1/vpc/_mcmCluster/eks-config/terragrunt.hcl

@@ -4,11 +4,10 @@ include "root" {
 
 locals {
   tag_costallocation = "census:csvd:platformbaseline"
-  providers = ["kubernetes", "helm"]
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=karpenter"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=mcmCluster"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -19,6 +18,10 @@ dependency "eks" {
   config_path = "../eks"
 }
 
+dependency "eks-karpenter" {
+  config_path = "../eks-karpenter"
+}
+
 inputs = {
   profile                                         = dependency.eks.inputs.profile
   vpc_id                                          = dependency.eks.outputs.vpc_id

lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl

@@ -1,9 +1,5 @@
-locals {
-  providers = ["kubernetes", "helm"]
-}
-
 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=mcmCluster"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]

lab/us-gov-east-1/vpc/_mcmCluster/eks-istio/terragrunt.hcl

@@ -1,14 +1,9 @@
 include "root" {
   path   = find_in_parent_folders()
-  expose = true
-}
-
-locals {
-  providers = ["kubernetes", "helm"]
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git?ref=1.0.4"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git?ref=mcmCluster"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]

lab/us-gov-east-1/vpc/_mcmCluster/eks-karpenter/terragrunt.hcl

@@ -4,11 +4,10 @@ include "root" {
 
 locals {
   tag_costallocation = "census:csvd:platformbaseline"
-  providers = ["kubernetes", "helm"]
 }
 
 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=mcmCluster"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -18,10 +17,12 @@ terraform {
 dependency "eks" {
   config_path = "../eks"
 }
-dependency "eks-config" {
-  config_path = "../eks-config"
-}
 
 inputs = {
-
+  profile = dependency.eks.inputs.profile
+  cluster_endpoint          = dependency.eks.outputs.cluster_endpoint
+  cluster_name              = dependency.eks.inputs.cluster_name
+  karpenter_node_group_name = dependency.eks.outputs.node_group_name
+  oidc_provider_arn         = dependency.eks.outputs.oidc_provider_arn
+  region                    = dependency.eks.inputs.region
 }

lab/us-gov-east-1/vpc/_mcmCluster/eks-kiali/terragrunt.hcl

@@ -4,11 +4,10 @@ include "root" {
 
 locals {
   tag_costallocation = "census:csvd:platformbaseline"
-  providers = ["kubernetes", "helm"]
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.git"
+  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"]

lab/us-gov-east-1/vpc/_mcmCluster/eks-loki/terragrunt.hcl

@@ -2,12 +2,8 @@ include "root" {
   path = find_in_parent_folders()
 }
 
-locals {
-  providers = ["kubernetes", "helm"]
-}
-
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-loki.git"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-loki.git?ref=mcmCluster"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -18,10 +14,7 @@ dependency "eks" {
   config_path = "../eks"
 }
 dependency "eks-config" {
-  config_path  = "../eks-config"
-}
-dependency "eks-istio" {
-  config_path  = "../eks-istio"
+  config_path = "../eks-config"
 }
 
 inputs = {

lab/us-gov-east-1/vpc/_mcmCluster/eks-metrics-server/terragrunt.hcl

@@ -4,11 +4,10 @@ include "root" {
 
 locals {
   tag_costallocation = "census:csvd:platformbaseline"
-  providers = ["kubernetes", "helm"]
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-metrics-server.git"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-metrics-server.git?ref=mcmCluster"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]

lab/us-gov-east-1/vpc/_mcmCluster/eks-prometheus/terragrunt.hcl

@@ -2,12 +2,8 @@ include "root" {
   path = find_in_parent_folders()
 }
 
-locals {
-  providers = ["kubernetes", "helm"]
-}
-
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.git"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.git?ref=mcmCluster"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]

lab/us-gov-east-1/vpc/_mcmCluster/eks-tempo/terragrunt.hcl

@@ -4,11 +4,10 @@ include "root" {
 
 locals {
   tag_costallocation = "census:csvd:platformbaseline"
-  providers = ["kubernetes", "helm"]
 }
 
 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=mcmCluster"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]

lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl

@@ -21,7 +21,6 @@ locals {
   profile                                  = "224384469011-lab-dev-gov"
   region                                   = local.region_vars.locals.aws_region
   cluster_mailing_list                     = "matthew.c.morgan@census.gov"
-  providers = ["kubernetes", "helm"]
 
   # Tags applied to AWS objects created
   tags = {

lab/us-gov-east-1/vpc/_mcmCluster/terragrunt.hcl

@@ -1,6 +1,6 @@
 locals {
   # Automatically load _envcommon, cross account and environment common variables
-  # common_vars = read_terragrunt_config("${dirname(find_in_parent_folders())}/_envcommon/common-variables.hcl", "skip-account-if-does-not-exist")
+  # common_vars = read_terragrunt_config(find_in_parent_folders("common_vars.hcl"))
   // "${get_tfvars_dir()}/${find_in_parent_folders("account.tfvars", "skip-account-if-does-not-exist")}",
 
   # Automatically load account-level variables (NOTE: In our environment account = environment so there is not separate environment layer)
@@ -23,7 +23,7 @@ locals {
   project_number = "fs0000000078"
   project_role   = "csvd_platformbaseline_mcm"
   region         = local.region_vars.locals.aws_region
-  providers = []
+  _module_providers = []
 }
 
 generate "provider" {
@@ -54,7 +54,7 @@ provider "aws" {
   allowed_account_ids = ["${local.account_id}"]
 }
 
-%{if contains(local.providers, "kubernetes") || contains(local.providers, "helm")}
+%{if contains(local._module_providers, "kubernetes") || contains(local._module_providers, "helm")}
 data "aws_eks_cluster" "cluster" {
   name = "${local.config.cluster_name}"
 }
@@ -67,7 +67,7 @@ provider "kubernetes" {
   token                  = data.aws_eks_cluster_auth.cluster.token
 }
 %{endif}
-%{if contains(local.providers, "helm")}
+%{if contains(local._module_providers, "helm")}
 provider "helm" {
   kubernetes {
     host = data.aws_eks_cluster.cluster.endpoint
@@ -96,5 +96,6 @@ remote_state {
 
 inputs = merge(
   local.account_vars.locals,
+  # local.common_vars.locals,
   local.region_vars.locals,
 )