From 6a3e25fec38791e9887ae54b25f178f1f3ade1f8 Mon Sep 17 00:00:00 2001
From: Matthew Creal Morgan <matthew.c.morgan@census.gov>
Date: Thu, 4 Sep 2025 17:08:57 -0700
Subject: [PATCH] bump versions to match upstream (#26)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🐛 fix([main.tf]): match upstream version from tfmod-eks (20.37.2)

updates beyond require aws provider v6 which will require refactor of resources

* 🐛 fix([main.tf]): add null_resource to test and inform regarding service linked role for spot instances
---
 README.md |  7 +++----
 main.tf   | 28 ++++++++++++++--------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index dac6793..e38ebc1 100644
--- a/README.md
+++ b/README.md
@@ -26,8 +26,8 @@ The module deploys Karpenter needed AWS resources, namely in IAM. It copies the
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 6.0.0 |
-| <a name="provider_aws.eecr"></a> [aws.eecr](#provider\_aws.eecr) | 6.0.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.100.0 |
+| <a name="provider_aws.eecr"></a> [aws.eecr](#provider\_aws.eecr) | 5.100.0 |
 | <a name="provider_helm"></a> [helm](#provider\_helm) | 3.0.2 |
 | <a name="provider_null"></a> [null](#provider\_null) | 3.2.4 |
 
@@ -36,13 +36,12 @@ The module deploys Karpenter needed AWS resources, namely in IAM. It copies the
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_images"></a> [images](#module\_images) | git::https://github.e.it.census.gov/terraform-modules/aws-ecr-copy-images.git | tf-upgrade |
-| <a name="module_karpenter_resources"></a> [karpenter\_resources](#module\_karpenter\_resources) | git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-eks.git//modules/karpenter | v20.36.0 |
+| <a name="module_karpenter_resources"></a> [karpenter\_resources](#module\_karpenter\_resources) | git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-eks.git//modules/karpenter | v20.37.2 |
 
 ## Resources
 
 | Name | Type |
 |------|------|
-| [aws_iam_service_linked_role.spot](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_service_linked_role) | resource |
 | [helm_release.karpenter](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
 | [helm_release.nodepool_resources](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
 | [null_resource.git_version](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
diff --git a/main.tf b/main.tf
index 693b262..ffbc633 100644
--- a/main.tf
+++ b/main.tf
@@ -21,7 +21,7 @@ locals {
 # Replicating from here: https://github.e.it.census.gov/SCT-Engineering/terraform-aws-eks/tree/master/modules/karpenter
 # Karpenter IRSA roles and policies
 module "karpenter_resources" {
-  source = "git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-eks.git//modules/karpenter?ref=v20.36.0"
+  source = "git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-eks.git//modules/karpenter?ref=v20.37.2"
 
   cluster_name                    = var.cluster_name
   create_access_entry             = true
@@ -60,7 +60,7 @@ data "aws_ecr_image" "karpenter_image" {
 resource "helm_release" "karpenter" {
   depends_on = [
     data.aws_ecr_image.karpenter_image,
-    aws_iam_service_linked_role.spot
+    # aws_iam_service_linked_role.spot
   ]
   name             = "karpenter"
   chart            = "karpenter"
@@ -117,15 +117,15 @@ resource "helm_release" "nodepool_resources" {
 }
 
 # Create service-linked role for EC2 Spot (required for Karpenter spot instances)
-resource "aws_iam_service_linked_role" "spot" {
-  aws_service_name = "spot.amazonaws.com"
-  description      = "Service-linked role for EC2 Spot instances used by Karpenter"
-
-  # This will only create the role if it doesn't already exist
-  # If it exists, Terraform will import the existing role
-  lifecycle {
-    ignore_changes = [
-      description,
-    ]
-  }
-}
+# resource "aws_iam_service_linked_role" "spot" {
+#   aws_service_name = "spot.amazonaws.com"
+#   description      = "Service-linked role for EC2 Spot instances used by Karpenter"
+
+#   # This will only create the role if it doesn't already exist
+#   # If it exists, Terraform will import the existing role
+#   lifecycle {
+#     ignore_changes = [
+#       description,
+#     ]
+#   }
+# }