From 22025831a38db4e0a809f0e1801779d76bff5e90 Mon Sep 17 00:00:00 2001 From: Lisa Guo Date: Wed, 28 May 2025 16:15:44 -0400 Subject: [PATCH 1/3] [Test] Fix k8s 1.33 tests by using AL2023 --- integration-tests/terraform/eks/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/terraform/eks/main.tf b/integration-tests/terraform/eks/main.tf index b7191bbd4..53e5fd01a 100644 --- a/integration-tests/terraform/eks/main.tf +++ b/integration-tests/terraform/eks/main.tf @@ -41,7 +41,7 @@ resource "aws_eks_node_group" "this" { min_size = 1 } - ami_type = "AL2_x86_64" + ami_type = var.k8s_version >= "1.33" ? "AL2023_x86_64" : "AL2_x86_64" capacity_type = "ON_DEMAND" disk_size = 20 instance_types = ["t3.medium"] From 6a13a347c157bcc8048d0cde963c01a49e03c4ad Mon Sep 17 00:00:00 2001 From: Lisa Guo Date: Wed, 28 May 2025 16:17:36 -0400 Subject: [PATCH 2/3] Use AL2023_x86_64_STANDARD --- integration-tests/terraform/eks/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/terraform/eks/main.tf b/integration-tests/terraform/eks/main.tf index 53e5fd01a..891ec780d 100644 --- a/integration-tests/terraform/eks/main.tf +++ b/integration-tests/terraform/eks/main.tf @@ -41,7 +41,7 @@ resource "aws_eks_node_group" "this" { min_size = 1 } - ami_type = var.k8s_version >= "1.33" ? "AL2023_x86_64" : "AL2_x86_64" + ami_type = var.k8s_version >= "1.33" ? "AL2023_x86_64_STANDARD" : "AL2_x86_64" capacity_type = "ON_DEMAND" disk_size = 20 instance_types = ["t3.medium"] From c98f5daef7c991ed450c2281619bb9ed14a07f1f Mon Sep 17 00:00:00 2001 From: Lisa Guo Date: Wed, 28 May 2025 16:25:48 -0400 Subject: [PATCH 3/3] Fix formatting --- integration-tests/terraform/eks/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/terraform/eks/main.tf b/integration-tests/terraform/eks/main.tf index 891ec780d..6c2506606 100644 --- a/integration-tests/terraform/eks/main.tf +++ b/integration-tests/terraform/eks/main.tf @@ -41,7 +41,7 @@ resource "aws_eks_node_group" "this" { min_size = 1 } - ami_type = var.k8s_version >= "1.33" ? "AL2023_x86_64_STANDARD" : "AL2_x86_64" + ami_type = var.k8s_version >= "1.33" ? "AL2023_x86_64_STANDARD" : "AL2_x86_64" capacity_type = "ON_DEMAND" disk_size = 20 instance_types = ["t3.medium"]