From 34c1887498bf6040d30b12432ce62b208778ca1b Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Thu, 16 Jan 2025 21:24:29 -0500
Subject: [PATCH 01/13] do not pass kubectl_image_tag

---
 lab/_envcommon/default-versions.hcl                       | 8 ++++----
 .../vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl    | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl
index 6a147b5..5fe0fa9 100644
--- a/lab/_envcommon/default-versions.hcl
+++ b/lab/_envcommon/default-versions.hcl
@@ -4,9 +4,9 @@ locals {
   #####################
   # Module Versions
   #####################
-  cluster_version            = "1.30"
+  cluster_version            = "1.31"
   custom_service_eks_account = "${local.release_version}"
-  eks_module_version         = "20.28.0"
+  eks_module_version         = "20.31.6"
   istio_ingress_version      = "${local.release_version}"
   release_version            = "0.1.1"
 
@@ -19,12 +19,12 @@ locals {
   null_version       = "3.2.1"
   random_version     = "3.5.1"
   template_version   = "2.2.0"
-  tf_version         = "1.5.0"
+  tf_version         = "1.8.0" # since we are using provider functions
 
   #####################
   # EKS Config
   #####################
-  kubectl_image_tag = "1.30.4"
+  # kubectl_image_tag = "1.30.4"
 
   ################
   # k8s-dashboard
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 d4a60db..469e29d 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
@@ -7,7 +7,7 @@ include "root" {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=${include.root.inputs.release_version}"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=no_kubectl"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -38,5 +38,5 @@ inputs = {
   security_group_all_worker_mgmt_id               = dependency.eks.outputs.security_group_all_worker_mgmt_id
   eks_managed_node_groups_autoscaling_group_names = dependency.eks.outputs.eks_managed_node_groups_autoscaling_group_names
   oidc_provider_arn                               = dependency.eks.outputs.oidc_provider_arn
-  kubectl_image_tag                               = include.root.inputs.kubectl_image_tag
+  # kubectl_image_tag                               = include.root.inputs.kubectl_image_tag
 }

From d710c2a3845caa8783b5c198b1c124b8ebf2e909 Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Thu, 16 Jan 2025 22:13:19 -0500
Subject: [PATCH 02/13] use the mod

---
 .../vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 469e29d..9668e8a 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
@@ -7,7 +7,7 @@ include "root" {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=no_kubectl"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=no-kubectl"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]

From 8a0d0684b3940def80c121388c38d7c90191612d Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Tue, 21 Jan 2025 19:11:23 -0500
Subject: [PATCH 03/13] pass release_version for helm charts

---
 .../vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 9668e8a..039ae7d 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
@@ -38,5 +38,5 @@ inputs = {
   security_group_all_worker_mgmt_id               = dependency.eks.outputs.security_group_all_worker_mgmt_id
   eks_managed_node_groups_autoscaling_group_names = dependency.eks.outputs.eks_managed_node_groups_autoscaling_group_names
   oidc_provider_arn                               = dependency.eks.outputs.oidc_provider_arn
-  # kubectl_image_tag                               = include.root.inputs.kubectl_image_tag
+  release_version                                 = include.root.inputs.release_version
 }

From a7ec287c1864d38de5af549b049893c5ee54ea46 Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Tue, 21 Jan 2025 19:22:10 -0500
Subject: [PATCH 04/13] no-kubectl

---
 .../vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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..6081dec 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
@@ -5,7 +5,7 @@ include "root" {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=${include.root.inputs.release_version}"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=n0-kubectl"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]

From ca37edfd6c5e69ec8ffa6c1671bfb27238b3c477 Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Tue, 21 Jan 2025 19:23:25 -0500
Subject: [PATCH 05/13] typo

---
 .../vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 6081dec..2438608 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
@@ -5,7 +5,7 @@ include "root" {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=n0-kubectl"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=no-kubectl"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]

From cc83c160a88738bb0bb138014158e03ab01986d4 Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Wed, 22 Jan 2025 16:33:37 -0500
Subject: [PATCH 06/13] more no-kubectl ripout

---
 .../eks-karpenter/terragrunt.hcl                     | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

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 6b1a862..5516b73 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
@@ -5,7 +5,7 @@ include "root" {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git?ref=${include.root.inputs.release_version}"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git?ref=no-kubectl"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -29,15 +29,13 @@ dependency "eks-config" {
 }
 
 inputs = {
-  profile                   = include.root.inputs.aws_profile
-  region                    = include.root.inputs.aws_region
   cluster_endpoint          = dependency.eks.outputs.cluster_endpoint
   cluster_name              = dependency.eks.outputs.cluster_name
+  karpenter_helm_chart      = include.root.inputs.karpenter_helm_chart
   karpenter_node_group_name = dependency.eks.outputs.node_group_name
+  karpenter_tag             = include.root.inputs.karpenter_tag
   oidc_provider_arn         = dependency.eks.outputs.oidc_provider_arn
+  profile                   = include.root.inputs.aws_profile
+  region                    = include.root.inputs.aws_region
   vpc_id                    = dependency.eks.outputs.vpc_id
-  karpenter_helm_chart      = include.root.inputs.karpenter_helm_chart
-  karpenter_tag             = include.root.inputs.karpenter_tag
-  kubectl_tag               = include.root.inputs.kubectl_image_tag
-
 }

From 2e19cf5c66153bc163d8f42568ea322c7453b10b Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Wed, 22 Jan 2025 16:57:48 -0500
Subject: [PATCH 07/13] pass release_version for custom helm charts

---
 .../vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl        | 1 +
 1 file changed, 1 insertion(+)

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 5516b73..e10cb75 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
@@ -37,5 +37,6 @@ inputs = {
   oidc_provider_arn         = dependency.eks.outputs.oidc_provider_arn
   profile                   = include.root.inputs.aws_profile
   region                    = include.root.inputs.aws_region
+  release_version           = include.root.inputs.release_version
   vpc_id                    = dependency.eks.outputs.vpc_id
 }

From b8681ecde7f601eed9a27c83c58ff39f20abe37d Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Wed, 22 Jan 2025 20:37:14 -0500
Subject: [PATCH 08/13] cruft

---
 .../vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl     | 1 +
 1 file changed, 1 insertion(+)

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 2438608..51b4f32 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
@@ -37,4 +37,5 @@ inputs = {
   cert_manager_startupapicheck_tag = include.root.inputs.cert_manager_startupapicheck_tag
   cert_manager_webhook_tag         = include.root.inputs.cert_manager_webhook_tag
   cluster_issuer_name              = include.root.inputs.cluster_issuer_name
+  release_version                  = include.root.inputs.release_version
 }

From 1017550ec873e70f762f423477fee6bedf0f912f Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Wed, 22 Jan 2025 23:08:36 -0500
Subject: [PATCH 09/13] updated versions

---
 lab/_envcommon/default-versions.hcl | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl
index 5fe0fa9..c9edb12 100644
--- a/lab/_envcommon/default-versions.hcl
+++ b/lab/_envcommon/default-versions.hcl
@@ -19,7 +19,7 @@ locals {
   null_version       = "3.2.1"
   random_version     = "3.5.1"
   template_version   = "2.2.0"
-  tf_version         = "1.8.0" # since we are using provider functions
+  tf_version         = "1.5.5"
 
   #####################
   # EKS Config
@@ -41,28 +41,28 @@ locals {
   cert_manager_controller_tag      = "v${local.cert_manager_version}"
   cert_manager_helm_chart          = "${local.cert_manager_version}"
   cert_manager_startupapicheck_tag = "v${local.cert_manager_version}"
-  cert_manager_version             = "1.16.1"
+  cert_manager_version             = "1.16.3"
   cert_manager_webhook_tag         = "v${local.cert_manager_version}"
 
   ################
   # Istio
   ################
-  istio_version = "1.22.1"
+  istio_version = "1.24.2"
 
   ################
   # Grafana
   ################
   download_dashboards_image_tag = "7.85.0"
-  grafana_chart_version         = "8.5.0"
+  grafana_chart_version         = "8.8.5"
   grafana_hostname              = "grafana"
-  grafana_tag                   = "11.1.5"
+  grafana_tag                   = "11.4.0"
   init_chown_data_image_tag     = "1.31.1"
 
   ################
   # Karpenter
   ################
-  karpenter_helm_chart = "1.0.6"
-  karpenter_tag        = "1.0.6"
+  karpenter_helm_chart = "1.1.1"
+  karpenter_tag        = "1.1.1"
 
   ################
   # Kiali
@@ -73,8 +73,8 @@ locals {
   ################
   # Loki
   ################
-  loki_chart_version              = "6.10.2"
-  loki_tag                        = "3.1.1"
+  loki_chart_version              = "6.25.0"
+  loki_tag                        = "3.3.2"
   canary_tag                      = "3.0.0"
   enterprise_logs_provisioner_tag = "v1.7.0"
   gateway_tag                     = "1.25.2-alpine"
@@ -102,6 +102,6 @@ locals {
   ################
   # Tempo
   ################
-  tempo_chart_version = "1.10.3"
-  tempo_tag           = "2.5.0"
+  tempo_chart_version = "1.31.1"
+  tempo_tag           = "2.7.0"
 }

From 9d8f28e382126f9dcfd171a074e55ee7c3768271 Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Fri, 24 Jan 2025 18:14:05 -0500
Subject: [PATCH 10/13] fix tempo chart ver

---
 lab/_envcommon/default-versions.hcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl
index c9edb12..e5d0828 100644
--- a/lab/_envcommon/default-versions.hcl
+++ b/lab/_envcommon/default-versions.hcl
@@ -102,6 +102,6 @@ locals {
   ################
   # Tempo
   ################
-  tempo_chart_version = "1.31.1"
+  tempo_chart_version = "1.18.1"
   tempo_tag           = "2.7.0"
 }

From fdb9bb23d1bab7fc50e58e2aff6abc64e8327775 Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Fri, 24 Jan 2025 18:19:54 -0500
Subject: [PATCH 11/13] revert testing branches

---
 .../vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl    | 2 +-
 .../vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl          | 2 +-
 .../vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl       | 2 +-
 3 files changed, 3 insertions(+), 3 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 51b4f32..40acb13 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
@@ -5,7 +5,7 @@ include "root" {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=no-kubectl"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=${include.root.inputs.release_version}"
   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-config/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl
index 039ae7d..2759537 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
@@ -7,7 +7,7 @@ include "root" {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=no-kubectl"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=${include.root.inputs.release_version}"
   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-karpenter/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl
index e10cb75..bbf116b 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
@@ -5,7 +5,7 @@ include "root" {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git?ref=no-kubectl"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]

From db01c89aa8b12b72122d35b4eb7d0908df4ac1ce Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Fri, 24 Jan 2025 18:50:20 -0500
Subject: [PATCH 12/13] sort

---
 .../eks-cert-manager/terragrunt.hcl                  | 12 ++++++------
 .../platform-eng-eks-mcm/eks-config/terragrunt.hcl   | 10 +++++-----
 .../vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl  |  2 +-
 .../platform-eng-eks-mcm/eks-grafana/terragrunt.hcl  | 12 ++++++------
 .../platform-eng-eks-mcm/eks-istio/terragrunt.hcl    |  4 ++--
 .../eks-k8s-dashboard/terragrunt.hcl                 | 10 +++++-----
 6 files changed, 25 insertions(+), 25 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 40acb13..a2e6077 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
@@ -26,16 +26,16 @@ dependency "eks_config" {
 }
 
 inputs = {
-  cluster_name                     = dependency.eks.outputs.cluster_name
-  cluster_mailing_list             = dependency.eks.inputs.creator
-  oidc_provider_arn                = dependency.eks.outputs.oidc_provider_arn
-  profile                          = include.root.inputs.aws_profile
-  region                           = include.root.inputs.aws_region
-  cert_manager_helm_chart          = include.root.inputs.cert_manager_helm_chart
   cert_manager_cainjector_tag      = include.root.inputs.cert_manager_cainjector_tag
   cert_manager_controller_tag      = include.root.inputs.cert_manager_controller_tag
+  cert_manager_helm_chart          = include.root.inputs.cert_manager_helm_chart
   cert_manager_startupapicheck_tag = include.root.inputs.cert_manager_startupapicheck_tag
   cert_manager_webhook_tag         = include.root.inputs.cert_manager_webhook_tag
   cluster_issuer_name              = include.root.inputs.cluster_issuer_name
+  cluster_mailing_list             = dependency.eks.inputs.creator
+  cluster_name                     = dependency.eks.outputs.cluster_name
+  oidc_provider_arn                = dependency.eks.outputs.oidc_provider_arn
+  profile                          = include.root.inputs.aws_profile
+  region                           = include.root.inputs.aws_region
   release_version                  = include.root.inputs.release_version
 }
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 2759537..5fb18d0 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
@@ -30,13 +30,13 @@ dependency "eks" {
 }
 
 inputs = {
-  profile                                         = include.root.inputs.aws_profile
-  region                                          = include.root.inputs.aws_region
-  vpc_id                                          = dependency.eks.outputs.vpc_id
   cluster_name                                    = dependency.eks.outputs.cluster_name
-  subnets                                         = dependency.eks.outputs.subnets
-  security_group_all_worker_mgmt_id               = dependency.eks.outputs.security_group_all_worker_mgmt_id
   eks_managed_node_groups_autoscaling_group_names = dependency.eks.outputs.eks_managed_node_groups_autoscaling_group_names
   oidc_provider_arn                               = dependency.eks.outputs.oidc_provider_arn
+  profile                                         = include.root.inputs.aws_profile
+  region                                          = include.root.inputs.aws_region
   release_version                                 = include.root.inputs.release_version
+  security_group_all_worker_mgmt_id               = dependency.eks.outputs.security_group_all_worker_mgmt_id
+  subnets                                         = dependency.eks.outputs.subnets
+  vpc_id                                          = dependency.eks.outputs.vpc_id
 }
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 6e28781..9b7c16f 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
@@ -34,9 +34,9 @@ inputs = {
   istio_ingress_lb  = dependency.istio.outputs.istio_ingress_lb
   profile           = include.root.inputs.aws_profile
   region            = include.root.inputs.aws_region
+  route53_endpoints = include.root.inputs.route53_endpoints
   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
-  route53_endpoints = include.root.inputs.route53_endpoints
 }
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 65ab33f..cf4f29a 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
@@ -27,14 +27,14 @@ dependency "eks-loki" {
 }
 
 inputs = {
-  profile                       = include.root.inputs.aws_profile
-  region                        = include.root.inputs.aws_region
-  cluster_name                  = dependency.eks.outputs.cluster_name
   cluster_domain                = dependency.eks.inputs.vpc_domain_name
-  public_hostname               = include.root.inputs.grafana_hostname
-  rwo_storage_class             = dependency.eks-loki.outputs.rwo_storage_class
+  cluster_name                  = dependency.eks.outputs.cluster_name
+  download_dashboards_image_tag = include.root.inputs.download_dashboards_image_tag
   grafana_chart_version         = include.root.inputs.grafana_chart_version
   grafana_tag                   = include.root.inputs.grafana_tag
-  download_dashboards_image_tag = include.root.inputs.download_dashboards_image_tag
   init_chown_data_image_tag     = include.root.inputs.init_chown_data_image_tag
+  profile                       = include.root.inputs.aws_profile
+  public_hostname               = include.root.inputs.grafana_hostname
+  region                        = include.root.inputs.aws_region
+  rwo_storage_class             = dependency.eks-loki.outputs.rwo_storage_class
 }
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 c7c22c8..fa9300c 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
@@ -24,9 +24,9 @@ dependency "eks-karpenter" {
 }
 
 inputs = {
-  profile             = include.root.inputs.aws_profile
-  region              = include.root.inputs.aws_region
   cluster_name        = dependency.eks.outputs.cluster_name
   istio_chart_version = include.root.inputs.istio_version
   istio_version       = include.root.inputs.istio_version
+  profile             = include.root.inputs.aws_profile
+  region              = include.root.inputs.aws_region
 }
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 cd1961b..ded7ad0 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
@@ -26,11 +26,11 @@ dependency "eks-loki" {
 }
 
 inputs = {
-  profile               = include.root.inputs.aws_profile
-  region                = include.root.inputs.aws_region
-  cluster_name          = dependency.eks.outputs.cluster_name
+  # datasources        = dependency.eks-loki.outputs.gateway_internal_endpoint
   cluster_domain        = dependency.eks.inputs.vpc_domain_name
-  public_hostname       = include.root.inputs.dashboard_hostname
+  cluster_name          = dependency.eks.outputs.cluster_name
   k8s_dashboard_version = include.root.inputs.k8s_dashboard_version
-  # datasources        = dependency.eks-loki.outputs.gateway_internal_endpoint
+  profile               = include.root.inputs.aws_profile
+  public_hostname       = include.root.inputs.dashboard_hostname
+  region                = include.root.inputs.aws_region
 }

From 1f049d035a43288bcd0d5399fc25c04628362d33 Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Fri, 24 Jan 2025 19:47:12 -0500
Subject: [PATCH 13/13] fix eks module

---
 lab/_envcommon/default-versions.hcl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl
index e5d0828..dd0b36b 100644
--- a/lab/_envcommon/default-versions.hcl
+++ b/lab/_envcommon/default-versions.hcl
@@ -6,14 +6,14 @@ locals {
   #####################
   cluster_version            = "1.31"
   custom_service_eks_account = "${local.release_version}"
-  eks_module_version         = "20.31.6"
+  eks_module_version         = "20.31.1"
   istio_ingress_version      = "${local.release_version}"
   release_version            = "0.1.1"
 
   #####################
   # TF Providers
   #####################
-  aws_version        = "5.14.0"
+  aws_version        = "5.84.0"
   helm_version       = "2.11.0"
   kubernetes_version = "2.33.0"
   null_version       = "3.2.1"