From 7cf9fe00f90c0c5c6c5f51915a5650ba22c84044 Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Fri, 6 Dec 2024 16:24:26 -0500
Subject: [PATCH] run-all plan

---
 .../eks-cert-manager/terragrunt.hcl           | 27 ++++++++++++++++
 .../eks-config/terragrunt.hcl                 |  6 ++--
 .../eks-dns/terragrunt.hcl                    | 30 +++++++++--------
 .../eks-grafana/terragrunt.hcl                | 30 +++++++++--------
 .../eks-istio/terragrunt.hcl                  | 30 +++++++++--------
 .../eks-k8s-dashboard/terragrunt.hcl          | 30 +++++++++--------
 .../eks-karpenter/terragrunt.hcl              | 30 +++++++++--------
 .../eks-kiali/terragrunt.hcl.disable          | 30 +++++++++--------
 .../eks-loki/terragrunt.hcl                   | 32 +++++++++++--------
 .../eks-metrics-server/terragrunt.hcl         | 30 +++++++++--------
 .../eks-prometheus/terragrunt.hcl             | 30 +++++++++--------
 .../eks-tempo/terragrunt.hcl                  | 30 +++++++++--------
 .../platform-eng-eks-mcm/eks/terragrunt.hcl   |  2 +-
 13 files changed, 203 insertions(+), 134 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
index 35e355a..3999e10 100644
--- 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
@@ -25,6 +25,33 @@ dependency "eks_config" {
   skip_outputs = true
 }
 
+locals {
+  providers = ["aws", "kubernetes", "helm"]
+}
+
+generate "other-providers" {
+  path      = "other-providers.tf"
+  if_exists = "overwrite"
+  contents  = <<-EOF
+  %{if contains(local.providers, "kubernetes")}
+  provider "kubernetes" {
+    host                   = "${dependency.eks.outputs.cluster_endpoint}"
+    cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
+    token                  = "${dependency.eks.outputs.cluster_token.token}"
+  }
+  %{endif}
+  %{if contains(local.providers, "helm")}
+  provider "helm" {
+    kubernetes {
+      host                   = "${dependency.eks.outputs.cluster_endpoint}"
+      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
+      token                  = "${dependency.eks.outputs.cluster_token.token}"
+    }
+  }
+  %{endif}
+EOF
+}
+
 inputs = {
   cluster_name                     = dependency.eks.outputs.cluster_name
   cluster_mailing_list             = dependency.eks.inputs.creator
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl
index 9d919ac..46e04b0 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl
@@ -24,7 +24,7 @@ dependency "eks" {
     oidc_provider_arn                               = "arn:aws-us-gov:iam::111111111111:oidc-provider/oidc.eks.us-gov-east-1.amazonaws.com/id/0000000000000000AAAAAAAAAAAAAAAA"
     security_group_all_worker_mgmt_id               = "sg-00b0000000000000"
     subnets                                         = ["subnet-00000000000000001", "subnet-00000000000000002", "subnet-00000000000000003"]
-    token                                           = [{ token = "THISISTHETOKENTHATDOESNTEXISTTHEREAREMANYLIKEITBUTHISONEISFORACLUSTER" }]
+    cluster_token                                           = [{ token = "THISISTHETOKENTHATDOESNTEXISTTHEREAREMANYLIKEITBUTHISONEISFORACLUSTER" }]
     vpc_id                                          = "a-vpc-id"
   }
 }
@@ -41,7 +41,7 @@ generate "other-providers" {
 provider "kubernetes" {
   host                   = "${dependency.eks.outputs.cluster_endpoint}"
   cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-  token                  = "${dependency.eks.outputs.provider_kubernetes_config.token}"
+  token                  = "${dependency.eks.outputs.cluster_token.token}"
 }
 %{endif}
 %{if contains(local.providers, "helm")}
@@ -49,7 +49,7 @@ provider "helm" {
   kubernetes {
     host                   = "${dependency.eks.outputs.cluster_endpoint}"
     cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.provider_kubernetes_config.token}"
+    token                  = "${dependency.eks.outputs.cluster_token.token}"
   }
 }
 %{endif}
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
index d0c2f63..e792085 100644
--- 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
@@ -29,26 +29,30 @@ dependency "istio" {
   }
 }
 
+locals {
+  providers = ["aws", "kubernetes", "helm"]
+}
+
 generate "other-providers" {
   path      = "other-providers.tf"
   if_exists = "overwrite"
   contents  = <<-EOF
-%{if contains(local.providers, "kubernetes")}
-provider "kubernetes" {
-  host                   = "${dependency.eks.outputs.cluster_endpoint}"
-  cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-  token                  = "${dependency.eks.outputs.provider_kubernetes_config.token}"
-}
-%{endif}
-%{if contains(local.providers, "helm")}
-provider "helm" {
-  kubernetes {
+  %{if contains(local.providers, "kubernetes")}
+  provider "kubernetes" {
     host                   = "${dependency.eks.outputs.cluster_endpoint}"
     cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.provider_kubernetes_config.token}"
+    token                  = "${dependency.eks.outputs.cluster_token.token}"
   }
-}
-%{endif}
+  %{endif}
+  %{if contains(local.providers, "helm")}
+  provider "helm" {
+    kubernetes {
+      host                   = "${dependency.eks.outputs.cluster_endpoint}"
+      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
+      token                  = "${dependency.eks.outputs.cluster_token.token}"
+    }
+  }
+  %{endif}
 EOF
 }
 
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
index 9215e89..efb0710 100644
--- 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
@@ -26,26 +26,30 @@ dependency "eks-loki" {
   }
 }
 
+locals {
+  providers = ["aws", "kubernetes", "helm"]
+}
+
 generate "other-providers" {
   path      = "other-providers.tf"
   if_exists = "overwrite"
   contents  = <<-EOF
-%{if contains(local.providers, "kubernetes")}
-provider "kubernetes" {
-  host                   = "${dependency.eks.outputs.cluster_endpoint}"
-  cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-  token                  = "${dependency.eks.outputs.provider_kubernetes_config.token}"
-}
-%{endif}
-%{if contains(local.providers, "helm")}
-provider "helm" {
-  kubernetes {
+  %{if contains(local.providers, "kubernetes")}
+  provider "kubernetes" {
     host                   = "${dependency.eks.outputs.cluster_endpoint}"
     cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.provider_kubernetes_config.token}"
+    token                  = "${dependency.eks.outputs.cluster_token.token}"
   }
-}
-%{endif}
+  %{endif}
+  %{if contains(local.providers, "helm")}
+  provider "helm" {
+    kubernetes {
+      host                   = "${dependency.eks.outputs.cluster_endpoint}"
+      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
+      token                  = "${dependency.eks.outputs.cluster_token.token}"
+    }
+  }
+  %{endif}
 EOF
 }
 
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl
index 67457cd..0cbd751 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl
@@ -23,26 +23,30 @@ dependency "eks-karpenter" {
   skip_outputs = true
 }
 
+locals {
+  providers = ["aws", "kubernetes", "helm"]
+}
+
 generate "other-providers" {
   path      = "other-providers.tf"
   if_exists = "overwrite"
   contents  = <<-EOF
-%{if contains(local.providers, "kubernetes")}
-provider "kubernetes" {
-  host                   = "${dependency.eks.outputs.cluster_endpoint}"
-  cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-  token                  = "${dependency.eks.outputs.provider_kubernetes_config.token}"
-}
-%{endif}
-%{if contains(local.providers, "helm")}
-provider "helm" {
-  kubernetes {
+  %{if contains(local.providers, "kubernetes")}
+  provider "kubernetes" {
     host                   = "${dependency.eks.outputs.cluster_endpoint}"
     cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.provider_kubernetes_config.token}"
+    token                  = "${dependency.eks.outputs.cluster_token.token}"
   }
-}
-%{endif}
+  %{endif}
+  %{if contains(local.providers, "helm")}
+  provider "helm" {
+    kubernetes {
+      host                   = "${dependency.eks.outputs.cluster_endpoint}"
+      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
+      token                  = "${dependency.eks.outputs.cluster_token.token}"
+    }
+  }
+  %{endif}
 EOF
 }
 
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
index 02c4e1b..6001036 100644
--- 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
@@ -25,26 +25,30 @@ dependency "eks-loki" {
   skip_outputs = true
 }
 
+locals {
+  providers = ["aws", "kubernetes", "helm"]
+}
+
 generate "other-providers" {
   path      = "other-providers.tf"
   if_exists = "overwrite"
   contents  = <<-EOF
-%{if contains(local.providers, "kubernetes")}
-provider "kubernetes" {
-  host                   = "${dependency.eks.outputs.cluster_endpoint}"
-  cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-  token                  = "${dependency.eks.outputs.provider_kubernetes_config.token}"
-}
-%{endif}
-%{if contains(local.providers, "helm")}
-provider "helm" {
-  kubernetes {
+  %{if contains(local.providers, "kubernetes")}
+  provider "kubernetes" {
     host                   = "${dependency.eks.outputs.cluster_endpoint}"
     cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.provider_kubernetes_config.token}"
+    token                  = "${dependency.eks.outputs.cluster_token.token}"
   }
-}
-%{endif}
+  %{endif}
+  %{if contains(local.providers, "helm")}
+  provider "helm" {
+    kubernetes {
+      host                   = "${dependency.eks.outputs.cluster_endpoint}"
+      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
+      token                  = "${dependency.eks.outputs.cluster_token.token}"
+    }
+  }
+  %{endif}
 EOF
 }
 
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
index ba364ee..3afd731 100644
--- 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
@@ -28,26 +28,30 @@ dependency "eks-config" {
   skip_outputs = true
 }
 
+locals {
+  providers = ["aws", "kubernetes", "helm"]
+}
+
 generate "other-providers" {
   path      = "other-providers.tf"
   if_exists = "overwrite"
   contents  = <<-EOF
-%{if contains(local.providers, "kubernetes")}
-provider "kubernetes" {
-  host                   = "${dependency.eks.outputs.cluster_endpoint}"
-  cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-  token                  = "${dependency.eks.outputs.provider_kubernetes_config.token}"
-}
-%{endif}
-%{if contains(local.providers, "helm")}
-provider "helm" {
-  kubernetes {
+  %{if contains(local.providers, "kubernetes")}
+  provider "kubernetes" {
     host                   = "${dependency.eks.outputs.cluster_endpoint}"
     cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.provider_kubernetes_config.token}"
+    token                  = "${dependency.eks.outputs.cluster_token.token}"
   }
-}
-%{endif}
+  %{endif}
+  %{if contains(local.providers, "helm")}
+  provider "helm" {
+    kubernetes {
+      host                   = "${dependency.eks.outputs.cluster_endpoint}"
+      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
+      token                  = "${dependency.eks.outputs.cluster_token.token}"
+    }
+  }
+  %{endif}
 EOF
 }
 
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl.disable b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl.disable
index d735b8b..9f8027b 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl.disable
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl.disable
@@ -53,26 +53,30 @@ dependency "eks-grafana" {
   }
 }
 
+locals {
+  providers = ["aws", "kubernetes", "helm"]
+}
+
 generate "other-providers" {
   path      = "other-providers.tf"
   if_exists = "overwrite"
   contents  = <<-EOF
-%{if contains(local.providers, "kubernetes")}
-provider "kubernetes" {
-  host                   = "${dependency.eks.outputs.cluster_endpoint}"
-  cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-  token                  = "${dependency.eks.outputs.provider_kubernetes_config.token}"
-}
-%{endif}
-%{if contains(local.providers, "helm")}
-provider "helm" {
-  kubernetes {
+  %{if contains(local.providers, "kubernetes")}
+  provider "kubernetes" {
     host                   = "${dependency.eks.outputs.cluster_endpoint}"
     cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.provider_kubernetes_config.token}"
+    token                  = "${dependency.eks.outputs.cluster_token.token}"
   }
-}
-%{endif}
+  %{endif}
+  %{if contains(local.providers, "helm")}
+  provider "helm" {
+    kubernetes {
+      host                   = "${dependency.eks.outputs.cluster_endpoint}"
+      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
+      token                  = "${dependency.eks.outputs.cluster_token.token}"
+    }
+  }
+  %{endif}
 EOF
 }
 
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
index 327335d..b59a73a 100644
--- 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
@@ -19,35 +19,41 @@ dependency "eks" {
     oidc_provider_arn = "arn:aws-us-gov:iam::111111111111:oidc-provider/oidc.eks.us-gov-east-1.amazonaws.com/id/0000000000000000AAAAAAAAAAAAAAAA"
   }
 }
+
 dependency "eks-istio" {
   config_path  = "../eks-istio"
   skip_outputs = true
 }
+
 dependency "eks-prometheus" {
   config_path  = "../eks-prometheus"
   skip_outputs = true
 }
 
+locals {
+  providers = ["aws", "kubernetes", "helm"]
+}
+
 generate "other-providers" {
   path      = "other-providers.tf"
   if_exists = "overwrite"
   contents  = <<-EOF
-%{if contains(local.providers, "kubernetes")}
-provider "kubernetes" {
-  host                   = "${dependency.eks.outputs.cluster_endpoint}"
-  cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-  token                  = "${dependency.eks.outputs.provider_kubernetes_config.token}"
-}
-%{endif}
-%{if contains(local.providers, "helm")}
-provider "helm" {
-  kubernetes {
+  %{if contains(local.providers, "kubernetes")}
+  provider "kubernetes" {
     host                   = "${dependency.eks.outputs.cluster_endpoint}"
     cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.provider_kubernetes_config.token}"
+    token                  = "${dependency.eks.outputs.cluster_token.token}"
   }
-}
-%{endif}
+  %{endif}
+  %{if contains(local.providers, "helm")}
+  provider "helm" {
+    kubernetes {
+      host                   = "${dependency.eks.outputs.cluster_endpoint}"
+      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
+      token                  = "${dependency.eks.outputs.cluster_token.token}"
+    }
+  }
+  %{endif}
 EOF
 }
 
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl
index 7ec3d76..2804272 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl
@@ -24,26 +24,30 @@ dependency "eks_config" {
   skip_outputs = true
 }
 
+locals {
+  providers = ["aws", "kubernetes", "helm"]
+}
+
 generate "other-providers" {
   path      = "other-providers.tf"
   if_exists = "overwrite"
   contents  = <<-EOF
-%{if contains(local.providers, "kubernetes")}
-provider "kubernetes" {
-  host                   = "${dependency.eks.outputs.cluster_endpoint}"
-  cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-  token                  = "${dependency.eks.outputs.provider_kubernetes_config.token}"
-}
-%{endif}
-%{if contains(local.providers, "helm")}
-provider "helm" {
-  kubernetes {
+  %{if contains(local.providers, "kubernetes")}
+  provider "kubernetes" {
     host                   = "${dependency.eks.outputs.cluster_endpoint}"
     cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.provider_kubernetes_config.token}"
+    token                  = "${dependency.eks.outputs.cluster_token.token}"
   }
-}
-%{endif}
+  %{endif}
+  %{if contains(local.providers, "helm")}
+  provider "helm" {
+    kubernetes {
+      host                   = "${dependency.eks.outputs.cluster_endpoint}"
+      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
+      token                  = "${dependency.eks.outputs.cluster_token.token}"
+    }
+  }
+  %{endif}
 EOF
 }
 
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
index 0d684f8..52078a5 100644
--- 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
@@ -24,26 +24,30 @@ dependency "eks-dns" {
   skip_outputs = true
 }
 
+locals {
+  providers = ["aws", "kubernetes", "helm"]
+}
+
 generate "other-providers" {
   path      = "other-providers.tf"
   if_exists = "overwrite"
   contents  = <<-EOF
-%{if contains(local.providers, "kubernetes")}
-provider "kubernetes" {
-  host                   = "${dependency.eks.outputs.cluster_endpoint}"
-  cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-  token                  = "${dependency.eks.outputs.provider_kubernetes_config.token}"
-}
-%{endif}
-%{if contains(local.providers, "helm")}
-provider "helm" {
-  kubernetes {
+  %{if contains(local.providers, "kubernetes")}
+  provider "kubernetes" {
     host                   = "${dependency.eks.outputs.cluster_endpoint}"
     cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.provider_kubernetes_config.token}"
+    token                  = "${dependency.eks.outputs.cluster_token.token}"
   }
-}
-%{endif}
+  %{endif}
+  %{if contains(local.providers, "helm")}
+  provider "helm" {
+    kubernetes {
+      host                   = "${dependency.eks.outputs.cluster_endpoint}"
+      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
+      token                  = "${dependency.eks.outputs.cluster_token.token}"
+    }
+  }
+  %{endif}
 EOF
 }
 
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
index b85df70..8b26975 100644
--- 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
@@ -32,26 +32,30 @@ dependency "eks-prometheus" {
   }
 }
 
+locals {
+  providers = ["aws", "kubernetes", "helm"]
+}
+
 generate "other-providers" {
   path      = "other-providers.tf"
   if_exists = "overwrite"
   contents  = <<-EOF
-%{if contains(local.providers, "kubernetes")}
-provider "kubernetes" {
-  host                   = "${dependency.eks.outputs.cluster_endpoint}"
-  cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-  token                  = "${dependency.eks.outputs.provider_kubernetes_config.token}"
-}
-%{endif}
-%{if contains(local.providers, "helm")}
-provider "helm" {
-  kubernetes {
+  %{if contains(local.providers, "kubernetes")}
+  provider "kubernetes" {
     host                   = "${dependency.eks.outputs.cluster_endpoint}"
     cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.provider_kubernetes_config.token}"
+    token                  = "${dependency.eks.outputs.cluster_token.token}"
   }
-}
-%{endif}
+  %{endif}
+  %{if contains(local.providers, "helm")}
+  provider "helm" {
+    kubernetes {
+      host                   = "${dependency.eks.outputs.cluster_endpoint}"
+      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
+      token                  = "${dependency.eks.outputs.cluster_token.token}"
+    }
+  }
+  %{endif}
 EOF
 }
 
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks/terragrunt.hcl
index ba46766..aa592a8 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks/terragrunt.hcl
@@ -5,7 +5,7 @@ include "root" {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=${include.root.inputs.release_version}"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=new_providers"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]