From eb755ba500c0e263dc423129c16753b65b55039c Mon Sep 17 00:00:00 2001 From: Justin Ross Date: Tue, 24 Jun 2025 10:17:45 -0600 Subject: [PATCH 01/11] chore: pin to 5.x aws provider --- versions.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions.tf b/versions.tf index 440e885e23..590fe74106 100644 --- a/versions.tf +++ b/versions.tf @@ -1,8 +1,8 @@ terraform { - required_version = ">= 0.12.9" + required_version = "~= 1.0" required_providers { - aws = ">= 5.13.0" + aws = "~= 5.13.0" local = ">= 1.2" null = ">= 2.1" template = ">= 2.1" From b59279c188044ebd9a4535ce8f4cc8e7aff82652 Mon Sep 17 00:00:00 2001 From: Justin Ross Date: Tue, 24 Jun 2025 10:26:17 -0600 Subject: [PATCH 02/11] chore: pin to 5.x aws provider --- versions.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions.tf b/versions.tf index 590fe74106..6c8f2e6366 100644 --- a/versions.tf +++ b/versions.tf @@ -1,8 +1,8 @@ terraform { - required_version = "~= 1.0" + required_version = "~> 1.0" required_providers { - aws = "~= 5.13.0" + aws = "~> 5.13.0" local = ">= 1.2" null = ">= 2.1" template = ">= 2.1" From 9efa5f35f7d77202aa4894da3b1af40796dd8a3c Mon Sep 17 00:00:00 2001 From: Justin Ross Date: Tue, 24 Jun 2025 10:30:25 -0600 Subject: [PATCH 03/11] chore: pin to 5.x aws provider --- versions.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.tf b/versions.tf index 6c8f2e6366..d5e6f81e3c 100644 --- a/versions.tf +++ b/versions.tf @@ -2,7 +2,7 @@ terraform { required_version = "~> 1.0" required_providers { - aws = "~> 5.13.0" + aws = "~> 5.0" local = ">= 1.2" null = ">= 2.1" template = ">= 2.1" From 9404daf98c4b865ccd70f087138790f46a6a408a Mon Sep 17 00:00:00 2001 From: Justin Ross Date: Tue, 24 Jun 2025 10:34:31 -0600 Subject: [PATCH 04/11] chore: pin to 5.x aws provider --- versions.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.tf b/versions.tf index d5e6f81e3c..a5aad0ecb1 100644 --- a/versions.tf +++ b/versions.tf @@ -2,7 +2,7 @@ terraform { required_version = "~> 1.0" required_providers { - aws = "~> 5.0" + aws = "5.100.0" local = ">= 1.2" null = ">= 2.1" template = ">= 2.1" From d94fb2f9e9f605855b02dda429519f02fe7a8084 Mon Sep 17 00:00:00 2001 From: Justin Ross Date: Tue, 24 Jun 2025 10:38:27 -0600 Subject: [PATCH 05/11] chore: pin to 5.x aws provider --- versions.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.tf b/versions.tf index a5aad0ecb1..d5e6f81e3c 100644 --- a/versions.tf +++ b/versions.tf @@ -2,7 +2,7 @@ terraform { required_version = "~> 1.0" required_providers { - aws = "5.100.0" + aws = "~> 5.0" local = ">= 1.2" null = ">= 2.1" template = ">= 2.1" From a2319b84872de9ce53f6957653b23261313070b1 Mon Sep 17 00:00:00 2001 From: Justin Ross Date: Tue, 24 Jun 2025 10:44:30 -0600 Subject: [PATCH 06/11] chore: pin to 5.x aws provider --- modules/eks-cloudwatch-alarms/main.tf | 7 +++++++ modules/iam-service-account/main.tf | 7 +++++++ modules/node_groups/main.tf | 6 ++++++ 3 files changed, 20 insertions(+) create mode 100644 modules/node_groups/main.tf diff --git a/modules/eks-cloudwatch-alarms/main.tf b/modules/eks-cloudwatch-alarms/main.tf index e0c226ddec..0d10b79711 100644 --- a/modules/eks-cloudwatch-alarms/main.tf +++ b/modules/eks-cloudwatch-alarms/main.tf @@ -1,3 +1,10 @@ +terraform { + required_version = ">= 1.0" + required_providers { + aws = "~> 5.0" + } +} + data "aws_caller_identity" "default" { } diff --git a/modules/iam-service-account/main.tf b/modules/iam-service-account/main.tf index 7a1c3a1500..5f7d781754 100644 --- a/modules/iam-service-account/main.tf +++ b/modules/iam-service-account/main.tf @@ -1,3 +1,10 @@ +terraform { + required_version = ">= 1.0" + required_providers { + aws = "~> 5.0" + } +} + locals { aws_account_id = data.aws_caller_identity.current.account_id } diff --git a/modules/node_groups/main.tf b/modules/node_groups/main.tf new file mode 100644 index 0000000000..cdef0d1fa7 --- /dev/null +++ b/modules/node_groups/main.tf @@ -0,0 +1,6 @@ +terraform { + required_version = ">= 1.0" + required_providers { + aws = "~> 5.0" + } +} \ No newline at end of file From a76160a660b090e77b399da5bb5f61f2103589bf Mon Sep 17 00:00:00 2001 From: Justin Ross Date: Tue, 24 Jun 2025 11:18:42 -0600 Subject: [PATCH 07/11] chore: ignore subnet changes --- cluster.tf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cluster.tf b/cluster.tf index 7b812f1809..582eec120f 100644 --- a/cluster.tf +++ b/cluster.tf @@ -26,8 +26,6 @@ resource "aws_eks_cluster" "this" { public_access_cidrs = var.cluster_endpoint_public_access_cidrs } - - dynamic "encryption_config" { for_each = var.encryption ? [1] : [] content { @@ -48,6 +46,10 @@ resource "aws_eks_cluster" "this" { aws_iam_role_policy_attachment.cluster_AmazonEKSServicePolicy, aws_cloudwatch_log_group.this ] + + lifecycle = { + ignore_changes = [vpc_config.subnet_ids] + } } resource "null_resource" "wait_for_cluster" { From 0e4bf8dbcabaea5eeee7cd0ed7e05ba32aa67ecf Mon Sep 17 00:00:00 2001 From: Justin Ross Date: Tue, 24 Jun 2025 11:20:59 -0600 Subject: [PATCH 08/11] chore: ignore subnet changes --- cluster.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster.tf b/cluster.tf index 582eec120f..4d3aabfc9c 100644 --- a/cluster.tf +++ b/cluster.tf @@ -47,7 +47,7 @@ resource "aws_eks_cluster" "this" { aws_cloudwatch_log_group.this ] - lifecycle = { + lifecycle { ignore_changes = [vpc_config.subnet_ids] } } From 2df5453b219357f78fc67a8f1207a3f0b3542fb5 Mon Sep 17 00:00:00 2001 From: Justin Ross Date: Tue, 24 Jun 2025 11:24:23 -0600 Subject: [PATCH 09/11] chore: ignore subnet changes --- cluster.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster.tf b/cluster.tf index 4d3aabfc9c..38f0795251 100644 --- a/cluster.tf +++ b/cluster.tf @@ -48,7 +48,7 @@ resource "aws_eks_cluster" "this" { ] lifecycle { - ignore_changes = [vpc_config.subnet_ids] + ignore_changes = [.vpc_config[0].subnet_ids] } } From d28f4a936f6425e3ff73dfc7a4a5193f02f7cefb Mon Sep 17 00:00:00 2001 From: Justin Ross Date: Tue, 24 Jun 2025 12:06:46 -0600 Subject: [PATCH 10/11] chore: ignore subnet changes --- cluster.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster.tf b/cluster.tf index 38f0795251..20266cf4e7 100644 --- a/cluster.tf +++ b/cluster.tf @@ -48,7 +48,7 @@ resource "aws_eks_cluster" "this" { ] lifecycle { - ignore_changes = [.vpc_config[0].subnet_ids] + ignore_changes = [vpc_config[0].subnet_ids] } } From cb0131f6efe5ffd36e0384221231892b38462780 Mon Sep 17 00:00:00 2001 From: Justin Ross Date: Tue, 24 Jun 2025 14:00:00 -0600 Subject: [PATCH 11/11] chore: update required terraform version --- versions.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.tf b/versions.tf index d5e6f81e3c..0d733cd904 100644 --- a/versions.tf +++ b/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 1.0" + required_version = ">= 1.0" required_providers { aws = "~> 5.0"