From 9b6c3df68d4d54938338126f600e309c7e363603 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Tue, 5 May 2026 18:30:32 -0400 Subject: [PATCH] update ami for 1.33 --- examples/full-cluster-tf-upgrade/1.33/main.tf | 22 +++++++++---------- .../README.upgrade-1.32-1.33.md | 7 +++--- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/examples/full-cluster-tf-upgrade/1.33/main.tf b/examples/full-cluster-tf-upgrade/1.33/main.tf index e1507fe..7ac64ef 100644 --- a/examples/full-cluster-tf-upgrade/1.33/main.tf +++ b/examples/full-cluster-tf-upgrade/1.33/main.tf @@ -97,7 +97,7 @@ resource "aws_eks_node_group" "eks-nodegroup" { node_group_name = format("%v%v-nodegroup", local._prefixes["eks"], var.cluster_name) node_role_arn = module.role_eks-nodegroup.role_arn subnet_ids = local.subnets - ami_type = "AL2_x86_64" + ami_type = "AL2023_x86_64_STANDARD" # instance_types = [var.eks_instance_type] # disk_size = var.eks_instance_disk_size @@ -230,17 +230,17 @@ resource "aws_launch_template" "eks-nodegroup" { } } - user_data = base64encode(local.eks-node-private-userdata) + # user_data = base64encode(local.eks-node-private-userdata) } #### User data for worker launch -locals { - eks-node-private-userdata = templatefile( - "${path.module}/templates/node-private-userdata.tmpl", { - endpoint = aws_eks_cluster.eks_cluster.endpoint - cluster_ca = aws_eks_cluster.eks_cluster.certificate_authority[0].data - cluster_name = var.cluster_name - } - ) -} +# locals { +# eks-node-private-userdata = templatefile( +# "${path.module}/templates/node-private-userdata.tmpl", { +# endpoint = aws_eks_cluster.eks_cluster.endpoint +# cluster_ca = aws_eks_cluster.eks_cluster.certificate_authority[0].data +# cluster_name = var.cluster_name +# } +# ) +# } diff --git a/examples/full-cluster-tf-upgrade/README.upgrade-1.32-1.33.md b/examples/full-cluster-tf-upgrade/README.upgrade-1.32-1.33.md index 18bc837..c6e4f34 100644 --- a/examples/full-cluster-tf-upgrade/README.upgrade-1.32-1.33.md +++ b/examples/full-cluster-tf-upgrade/README.upgrade-1.32-1.33.md @@ -10,7 +10,6 @@ Copy files from 1.33/{path} to eks-{clustername}/{path} * main.tf * charts.yml * images.yml -* versions.tf * addons/addons.yml @@ -56,7 +55,9 @@ There is some approach/process to upgrade the version, find it and put it here. - addons/addon_cloudwatch.tf and - common-services/cluster-autoscaler/cluster-autoscaler.tf -- 1.33.0 -- 2026-04-16 +- 1.33.0 -- 2026-05-05 - add files to update - - addons/addons.tf + - main.tf + - charts.yml + - images.yml - addons/addons.yml