From 6766fd88c627a960f193c21d5694ebd970e50b6e Mon Sep 17 00:00:00 2001
From: Matthew Creal Morgan <matthew.c.morgan@census.gov>
Date: Wed, 12 Feb 2025 16:11:02 -0800
Subject: [PATCH] versions updated (#34)

updated versions
added taints
removed taints (invalid until karpenter is available)
---
 .pre-commit-config.yaml |  2 +-
 README.md               |  2 +-
 main.tf                 | 33 +++++++++++----------------------
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 5a5c34b..ef52d70 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -37,7 +37,7 @@ repos:
 
 # Terraform Hooks
 - repo: https://github.com/antonbabenko/pre-commit-terraform
-  rev: v1.96.1 # Get the latest from: https://github.com/antonbabenko/pre-commit-terraform/releases
+  rev: v1.97.3 # Get the latest from: https://github.com/antonbabenko/pre-commit-terraform/releases
   hooks:
     - id: terraform_fmt
       args:
diff --git a/README.md b/README.md
index bf9d153..d0313b0 100644
--- a/README.md
+++ b/README.md
@@ -91,7 +91,7 @@ Change logs are auto-generated with commitizen.
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_cloudwatch_observability_irsa_role"></a> [cloudwatch\_observability\_irsa\_role](#module\_cloudwatch\_observability\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | n/a |
-| <a name="module_cluster"></a> [cluster](#module\_cluster) | git@github.e.it.census.gov:SCT-Engineering/terraform-aws-eks.git | v20.31.1 |
+| <a name="module_cluster"></a> [cluster](#module\_cluster) | git@github.e.it.census.gov:SCT-Engineering/terraform-aws-eks.git | v20.33.1 |
 | <a name="module_ebs_csi_irsa_role"></a> [ebs\_csi\_irsa\_role](#module\_ebs\_csi\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | n/a |
 | <a name="module_efs_csi_irsa_role"></a> [efs\_csi\_irsa\_role](#module\_efs\_csi\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | n/a |
 | <a name="module_vpc_cni_irsa_role"></a> [vpc\_cni\_irsa\_role](#module\_vpc\_cni\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | n/a |
diff --git a/main.tf b/main.tf
index 6fb7632..068d433 100644
--- a/main.tf
+++ b/main.tf
@@ -33,7 +33,6 @@ locals {
     "boc:eks_cluster_name"   = var.cluster_name
     "boc:tf_module_name"     = local.module_name
     "boc:tf_module_version"  = local.module_version
-    "boc:created_by"         = "terragrunt"
     "karpenter.sh/discovery" = var.cluster_name
   }
   max_tag_count  = 45
@@ -45,7 +44,7 @@ locals {
 }
 
 module "cluster" {
-  source = "git@github.e.it.census.gov:SCT-Engineering/terraform-aws-eks.git?ref=v20.31.1"
+  source = "git@github.e.it.census.gov:SCT-Engineering/terraform-aws-eks.git?ref=v20.33.1"
 
   cluster_name                             = var.cluster_name
   cluster_version                          = var.cluster_version
@@ -79,17 +78,6 @@ module "cluster" {
     }
     coredns = {
       most_recent = true
-      configuration_values = jsonencode({
-        tolerations = [
-          # Allow CoreDNS to run on the same nodes as the Karpenter controller
-          # for use during cluster creation when Karpenter nodes do not yet exist
-          {
-            key    = "karpenter.sh/controller"
-            value  = "true"
-            effect = "NoSchedule"
-          }
-        ]
-      })
     }
     eks-pod-identity-agent = {
       most_recent = true
@@ -143,15 +131,16 @@ module "cluster" {
       labels = {
         intent = "control-apps"
       }
-      taints = {
-        # The pods that do not tolerate this taint should run on nodes
-        # created by Karpenter
-        karpenter = {
-          key    = "karpenter.sh/controller"
-          value  = "true"
-          effect = "NO_SCHEDULE"
-        }
-      }
+      # This cannot be enabled until karpenter is available.
+      # taints = {
+      #   # The pods that do not tolerate this taint should run on nodes
+      #   # created by Karpenter
+      #   karpenter = {
+      #     key    = "karpenter.sh/controller"
+      #     value  = "true"
+      #     effect = "NO_SCHEDULE"
+      #   }
+      # }
     }
   }
   tags = local.tags