From 36ceb05ccbe4f0500f073c39600d9806a053de4c Mon Sep 17 00:00:00 2001 From: Bryant Biggs Date: Tue, 1 Jul 2025 12:44:15 -0500 Subject: [PATCH] docs: Update doc references to `1.33`; remove AL2 examples since `1.33`+ does not support AL2 --- README.md | 6 ++-- docs/compute_resources.md | 4 +-- examples/eks-auto-mode/main.tf | 2 +- .../eks-hybrid-nodes/ami/variables.pkr.hcl | 2 +- examples/eks-hybrid-nodes/main.tf | 2 +- examples/eks-managed-node-group/README.md | 1 - examples/eks-managed-node-group/eks-al2.tf | 34 ------------------- examples/eks-managed-node-group/eks-al2023.tf | 2 +- .../eks-bottlerocket.tf | 2 +- examples/karpenter/main.tf | 2 +- examples/self-managed-node-group/README.md | 1 - examples/self-managed-node-group/eks-al2.tf | 33 ------------------ .../self-managed-node-group/eks-al2023.tf | 2 +- .../eks-bottlerocket.tf | 2 +- tests/eks-fargate-profile/main.tf | 2 +- tests/eks-managed-node-group/main.tf | 2 +- tests/fast-addons/main.tf | 2 +- tests/self-managed-node-group/main.tf | 2 +- 18 files changed, 17 insertions(+), 86 deletions(-) delete mode 100644 examples/eks-managed-node-group/eks-al2.tf delete mode 100644 examples/self-managed-node-group/eks-al2.tf diff --git a/README.md b/README.md index 4b2f4b1b2a..4767a624e1 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ module "eks" { version = "~> 20.31" cluster_name = "example" - cluster_version = "1.31" + cluster_version = "1.33" # Optional cluster_endpoint_public_access = true @@ -82,7 +82,7 @@ module "eks" { version = "~> 20.31" cluster_name = "example" - cluster_version = "1.31" + cluster_version = "1.33" cluster_addons = { coredns = {} @@ -149,7 +149,7 @@ module "eks" { version = "~> 20.0" cluster_name = "my-cluster" - cluster_version = "1.31" + cluster_version = "1.33" bootstrap_self_managed_addons = false cluster_addons = { diff --git a/docs/compute_resources.md b/docs/compute_resources.md index 6b74c4a507..a7bd5b5e93 100644 --- a/docs/compute_resources.md +++ b/docs/compute_resources.md @@ -113,7 +113,7 @@ Refer to the [Self Managed Node Group documentation](https://docs.aws.amazon.com 1. The `self-managed-node-group` uses the latest AWS EKS Optimized AMI (Linux) for the given Kubernetes version by default: ```hcl - cluster_version = "1.31" + cluster_version = "1.33" # This self managed node group will use the latest AWS EKS Optimized AMI for Kubernetes 1.27 self_managed_node_groups = { @@ -124,7 +124,7 @@ Refer to the [Self Managed Node Group documentation](https://docs.aws.amazon.com 2. To use Bottlerocket, specify the `ami_type` as one of the respective `"BOTTLEROCKET_*" types` and supply a Bottlerocket OS AMI: ```hcl - cluster_version = "1.31" + cluster_version = "1.33" self_managed_node_groups = { bottlerocket = { diff --git a/examples/eks-auto-mode/main.tf b/examples/eks-auto-mode/main.tf index 756437d297..316b2764d4 100644 --- a/examples/eks-auto-mode/main.tf +++ b/examples/eks-auto-mode/main.tf @@ -12,7 +12,7 @@ data "aws_availability_zones" "available" { locals { name = "ex-${basename(path.cwd)}" - cluster_version = "1.31" + cluster_version = "1.33" region = "us-west-2" vpc_cidr = "10.0.0.0/16" diff --git a/examples/eks-hybrid-nodes/ami/variables.pkr.hcl b/examples/eks-hybrid-nodes/ami/variables.pkr.hcl index 89e1b27ffa..1eb9c4726b 100644 --- a/examples/eks-hybrid-nodes/ami/variables.pkr.hcl +++ b/examples/eks-hybrid-nodes/ami/variables.pkr.hcl @@ -7,7 +7,7 @@ variable "ami_name_prefix" { variable "eks_version" { description = "The EKS cluster version associated with the AMI created" type = string - default = "1.31" + default = "1.33" } variable "credential_provider" { diff --git a/examples/eks-hybrid-nodes/main.tf b/examples/eks-hybrid-nodes/main.tf index 8791e6cb53..ffc77e36a2 100644 --- a/examples/eks-hybrid-nodes/main.tf +++ b/examples/eks-hybrid-nodes/main.tf @@ -20,7 +20,7 @@ locals { name = "ex-${basename(path.cwd)}" region = "us-west-2" - cluster_version = "1.31" + cluster_version = "1.33" tags = { Test = local.name diff --git a/examples/eks-managed-node-group/README.md b/examples/eks-managed-node-group/README.md index a75636480a..16708dca42 100644 --- a/examples/eks-managed-node-group/README.md +++ b/examples/eks-managed-node-group/README.md @@ -2,7 +2,6 @@ Configuration in this directory creates Amazon EKS clusters with EKS Managed Node Groups demonstrating different configurations: -- `eks-al2.tf` demonstrates an EKS cluster using EKS managed node group that utilizes the EKS Amazon Linux 2 optimized AMI - `eks-al2023.tf` demonstrates an EKS cluster using EKS managed node group that utilizes the EKS Amazon Linux 2023 optimized AMI - `eks-bottlerocket.tf` demonstrates an EKS cluster using EKS managed node group that utilizes the Bottlerocket EKS optimized AMI diff --git a/examples/eks-managed-node-group/eks-al2.tf b/examples/eks-managed-node-group/eks-al2.tf deleted file mode 100644 index 910fa216b2..0000000000 --- a/examples/eks-managed-node-group/eks-al2.tf +++ /dev/null @@ -1,34 +0,0 @@ -module "eks_al2" { - source = "terraform-aws-modules/eks/aws" - version = "~> 20.0" - - cluster_name = "${local.name}-al2" - cluster_version = "1.31" - - # EKS Addons - cluster_addons = { - coredns = {} - eks-pod-identity-agent = {} - kube-proxy = {} - vpc-cni = {} - } - - vpc_id = module.vpc.vpc_id - subnet_ids = module.vpc.private_subnets - - eks_managed_node_groups = { - example = { - # Starting on 1.30, AL2023 is the default AMI type for EKS managed node groups - ami_type = "AL2_x86_64" - instance_types = ["m6i.large"] - - min_size = 2 - max_size = 5 - # This value is ignored after the initial creation - # https://github.com/bryantbiggs/eks-desired-size-hack - desired_size = 2 - } - } - - tags = local.tags -} diff --git a/examples/eks-managed-node-group/eks-al2023.tf b/examples/eks-managed-node-group/eks-al2023.tf index 8fe34c62c2..93fda067da 100644 --- a/examples/eks-managed-node-group/eks-al2023.tf +++ b/examples/eks-managed-node-group/eks-al2023.tf @@ -3,7 +3,7 @@ module "eks_al2023" { version = "~> 20.0" cluster_name = "${local.name}-al2023" - cluster_version = "1.31" + cluster_version = "1.33" # EKS Addons cluster_addons = { diff --git a/examples/eks-managed-node-group/eks-bottlerocket.tf b/examples/eks-managed-node-group/eks-bottlerocket.tf index 01a6878814..4d25e5b9c0 100644 --- a/examples/eks-managed-node-group/eks-bottlerocket.tf +++ b/examples/eks-managed-node-group/eks-bottlerocket.tf @@ -3,7 +3,7 @@ module "eks_bottlerocket" { version = "~> 20.0" cluster_name = "${local.name}-bottlerocket" - cluster_version = "1.31" + cluster_version = "1.33" # EKS Addons cluster_addons = { diff --git a/examples/karpenter/main.tf b/examples/karpenter/main.tf index 9961063c95..7006740f47 100644 --- a/examples/karpenter/main.tf +++ b/examples/karpenter/main.tf @@ -55,7 +55,7 @@ module "eks" { source = "../.." cluster_name = local.name - cluster_version = "1.31" + cluster_version = "1.33" # Gives Terraform identity admin access to cluster which will # allow deploying resources (Karpenter) into the cluster diff --git a/examples/self-managed-node-group/README.md b/examples/self-managed-node-group/README.md index da81c84142..ce84716f8a 100644 --- a/examples/self-managed-node-group/README.md +++ b/examples/self-managed-node-group/README.md @@ -2,7 +2,6 @@ Configuration in this directory creates Amazon EKS clusters with self-managed node groups demonstrating different configurations: -- `eks-al2.tf` demonstrates an EKS cluster using self-managed node group that utilizes the EKS Amazon Linux 2 optimized AMI - `eks-al2023.tf` demonstrates an EKS cluster using self-managed node group that utilizes the EKS Amazon Linux 2023 optimized AMI - `eks-bottlerocket.tf` demonstrates an EKS cluster using self-managed node group that utilizes the Bottlerocket EKS optimized AMI diff --git a/examples/self-managed-node-group/eks-al2.tf b/examples/self-managed-node-group/eks-al2.tf deleted file mode 100644 index e015982733..0000000000 --- a/examples/self-managed-node-group/eks-al2.tf +++ /dev/null @@ -1,33 +0,0 @@ -module "eks_al2" { - source = "terraform-aws-modules/eks/aws" - version = "~> 20.0" - - cluster_name = "${local.name}-al2" - cluster_version = "1.31" - - # EKS Addons - cluster_addons = { - coredns = {} - eks-pod-identity-agent = {} - kube-proxy = {} - vpc-cni = {} - } - - vpc_id = module.vpc.vpc_id - subnet_ids = module.vpc.private_subnets - - self_managed_node_groups = { - example = { - ami_type = "AL2_x86_64" - instance_type = "m6i.large" - - min_size = 2 - max_size = 5 - # This value is ignored after the initial creation - # https://github.com/bryantbiggs/eks-desired-size-hack - desired_size = 2 - } - } - - tags = local.tags -} diff --git a/examples/self-managed-node-group/eks-al2023.tf b/examples/self-managed-node-group/eks-al2023.tf index 4d7c5dc7e1..58ecb3cf66 100644 --- a/examples/self-managed-node-group/eks-al2023.tf +++ b/examples/self-managed-node-group/eks-al2023.tf @@ -3,7 +3,7 @@ module "eks_al2023" { version = "~> 20.0" cluster_name = "${local.name}-al2023" - cluster_version = "1.31" + cluster_version = "1.33" # EKS Addons cluster_addons = { diff --git a/examples/self-managed-node-group/eks-bottlerocket.tf b/examples/self-managed-node-group/eks-bottlerocket.tf index ff2fb2cf3d..adb3462b82 100644 --- a/examples/self-managed-node-group/eks-bottlerocket.tf +++ b/examples/self-managed-node-group/eks-bottlerocket.tf @@ -3,7 +3,7 @@ module "eks_bottlerocket" { version = "~> 20.0" cluster_name = "${local.name}-bottlerocket" - cluster_version = "1.31" + cluster_version = "1.33" # EKS Addons cluster_addons = { diff --git a/tests/eks-fargate-profile/main.tf b/tests/eks-fargate-profile/main.tf index 37fc44b3f9..bf91d522a8 100644 --- a/tests/eks-fargate-profile/main.tf +++ b/tests/eks-fargate-profile/main.tf @@ -12,7 +12,7 @@ data "aws_availability_zones" "available" { locals { name = "ex-${basename(path.cwd)}" - cluster_version = "1.31" + cluster_version = "1.33" region = "eu-west-1" vpc_cidr = "10.0.0.0/16" diff --git a/tests/eks-managed-node-group/main.tf b/tests/eks-managed-node-group/main.tf index aa73cec30f..010a55fa1b 100644 --- a/tests/eks-managed-node-group/main.tf +++ b/tests/eks-managed-node-group/main.tf @@ -14,7 +14,7 @@ data "aws_availability_zones" "available" { locals { name = "ex-${replace(basename(path.cwd), "_", "-")}" - cluster_version = "1.31" + cluster_version = "1.33" region = "eu-west-1" vpc_cidr = "10.0.0.0/16" diff --git a/tests/fast-addons/main.tf b/tests/fast-addons/main.tf index 12d2a41f8c..e7a5b9cc55 100644 --- a/tests/fast-addons/main.tf +++ b/tests/fast-addons/main.tf @@ -4,7 +4,7 @@ provider "aws" { locals { name = "ex-${basename(path.cwd)}" - cluster_version = "1.31" + cluster_version = "1.33" region = "eu-west-1" tags = { diff --git a/tests/self-managed-node-group/main.tf b/tests/self-managed-node-group/main.tf index f2181fdc75..351985f359 100644 --- a/tests/self-managed-node-group/main.tf +++ b/tests/self-managed-node-group/main.tf @@ -14,7 +14,7 @@ data "aws_availability_zones" "available" { locals { name = "ex-${replace(basename(path.cwd), "_", "-")}" - cluster_version = "1.31" + cluster_version = "1.33" region = "eu-west-1" vpc_cidr = "10.0.0.0/16"