From bae4595914eef40a4a3779846975440c56245591 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Wed, 27 Aug 2025 18:19:39 -0400 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B=20fix([main.tf]):=20match=20up?= =?UTF-8?q?stream=20version=20from=20tfmod-eks=20(20.37.2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates beyond require aws provider v6 which will require refactor of resources --- README.md | 2 +- main.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index dac6793..f1da491 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ The module deploys Karpenter needed AWS resources, namely in IAM. It copies the | Name | Source | Version | |------|--------|---------| | [images](#module\_images) | git::https://github.e.it.census.gov/terraform-modules/aws-ecr-copy-images.git | tf-upgrade | -| [karpenter\_resources](#module\_karpenter\_resources) | git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-eks.git//modules/karpenter | v20.36.0 | +| [karpenter\_resources](#module\_karpenter\_resources) | git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-eks.git//modules/karpenter | v20.37.2 | ## Resources diff --git a/main.tf b/main.tf index 693b262..26fd67e 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 From 90d96c238e026a1f0a03ee3893a4cfb40c8b8757 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Wed, 27 Aug 2025 18:35:23 -0400 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=90=9B=20fix([main.tf]):=20add=20null?= =?UTF-8?q?=5Fresource=20to=20test=20and=20inform=20regarding=20service=20?= =?UTF-8?q?linked=20role=20for=20spot=20instances?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 ++--- main.tf | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index f1da491..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 | |------|---------| -| [aws](#provider\_aws) | 6.0.0 | -| [aws.eecr](#provider\_aws.eecr) | 6.0.0 | +| [aws](#provider\_aws) | 5.100.0 | +| [aws.eecr](#provider\_aws.eecr) | 5.100.0 | | [helm](#provider\_helm) | 3.0.2 | | [null](#provider\_null) | 3.2.4 | @@ -42,7 +42,6 @@ The module deploys Karpenter needed AWS resources, namely in IAM. It copies the | 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 26fd67e..ffbc633 100644 --- a/main.tf +++ b/main.tf @@ -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, +# ] +# } +# }