diff --git a/examples/full-cluster-tf-upgrade/1.33/charts.yml b/examples/full-cluster-tf-upgrade/1.33/charts.yml index 44712c4..b25d385 100644 --- a/examples/full-cluster-tf-upgrade/1.33/charts.yml +++ b/examples/full-cluster-tf-upgrade/1.33/charts.yml @@ -2,13 +2,13 @@ cluster-autoscaler: documentation: "https://artifacthub.io/packages/helm/cluster-autoscaler/cluster-autoscaler" name: "cluster-autoscaler" repository: "https://kubernetes.github.io/autoscaler" - version: "9.52.1" + version: "9.47.0" use_remote: true cert-manager: documetation: "https://artifacthub.io/packages/helm/cert-manager/cert-manager" name: "cert-manager" repository: "https://charts.jetstack.io" - version: "1.19.1" + version: "1.19.5" use_remote: true metrics-server: # documentation: "https://artifacthub.io/packages/helm/bitnami/metrics-server" diff --git a/examples/full-cluster-tf-upgrade/1.33/images.yml b/examples/full-cluster-tf-upgrade/1.33/images.yml index 3251462..66995ee 100644 --- a/examples/full-cluster-tf-upgrade/1.33/images.yml +++ b/examples/full-cluster-tf-upgrade/1.33/images.yml @@ -8,7 +8,7 @@ karpenter-controller: source_tag: null enabled: false # tag: "1.0.6" - tag: "1.8.0" + tag: "1.9.0" cluster-autoscaler: documentation: "https://github.com/kubernetes/autoscaler/releases" name: "cluster-autoscaler" @@ -18,7 +18,7 @@ cluster-autoscaler: source_image: "autoscaling/cluster-autoscaler" source_tag: null enabled: true - tag: "v1.34.1" + tag: "v1.33.4" cert-manager-controller: documentation: "https://cert-manager.io/docs/releases/" name: "cert-manager-controller" @@ -28,7 +28,7 @@ cert-manager-controller: source_image: "jetstack/cert-manager-controller" source_tag: null enabled: true - tag: "v1.19.1" + tag: "v1.19.5" cert-manager-cainjector: documentation: "https://cert-manager.io/docs/releases/" name: "cert-manager-cainjector" @@ -38,7 +38,7 @@ cert-manager-cainjector: source_image: "jetstack/cert-manager-cainjector" source_tag: null enabled: true - tag: "v1.19.1" + tag: "v1.19.5" cert-manager-webhook: documentation: "https://cert-manager.io/docs/releases/" name: "cert-manager-webhook" @@ -48,7 +48,7 @@ cert-manager-webhook: source_image: "jetstack/cert-manager-webhook" source_tag: null enabled: true - tag: "v1.19.1" + tag: "v1.19.5" cert-manager-ctl: documentation: "https://cert-manager.io/docs/releases/" name: "cert-manager-ctl" @@ -59,7 +59,7 @@ cert-manager-ctl: source_tag: null enabled: false # tag: "v1.16.2" - tag: "v1.14.7" + tag: "v1.19.5" cert-manager-startupapicheck: documentation: "https://cert-manager.io/docs/releases/" name: "cert-manager-startupapicheck" @@ -69,7 +69,7 @@ cert-manager-startupapicheck: source_image: "jetstack/cert-manager-startupapicheck" source_tag: null enabled: true - tag: "v1.19.1" + tag: "v1.19.5" metrics-server: # documentation: "https://hub.docker.com/r/bitnami/metrics-server/tags" name: "metrics-server" @@ -93,7 +93,7 @@ istio-operator: source_image: "istio/operator" source_tag: null enabled: true - tag: "1.23.6" + tag: "1.26.8" istio-pilot: documentation: "https://istio.io/latest/docs/releases/supported-releases" name: "istio/pilot" @@ -104,7 +104,7 @@ istio-pilot: source_tag: null enabled: true # tag: "1.25.3" - tag: "1.28.0" + tag: "1.26.8" istio-proxyv2: documentation: "https://istio.io/latest/docs/releases/supported-releases" name: "istio/proxyv2" @@ -115,7 +115,7 @@ istio-proxyv2: source_tag: null enabled: true # tag: "1.25.3" - tag: "1.28.0" + tag: "1.26.8" prometheus: documentation: "https://hub.docker.com/r/bitnami/prometheus/tags" name: "prometheus" @@ -128,7 +128,7 @@ prometheus: enabled: true # tag: "3.0.1" # tag: "v2.54.0" - tag: "v3.8.0" + tag: "v3.9.1" prometheus-operator: # documentation: "https://hub.docker.com/r/bitnami/prometheus-operator/tags" name: "prometheus-operator" @@ -143,7 +143,7 @@ prometheus-operator: enabled: true # tag: "0.79.2" ## tag: "v0.74.0" - tag: "v0.87.0" + tag: "v0.89.0" alertmanager: # documentation: "https://hub.docker.com/r/bitnami/alertmanager/tags" name: "alertmanager" @@ -155,4 +155,4 @@ alertmanager: enabled: true # tag: "0.27.0" ## tag: "v0.28.0" - tag: "v0.29.0" + tag: "v0.31.1" 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/1.34/main.tf b/examples/full-cluster-tf-upgrade/1.34/main.tf index e1507fe..7ac64ef 100644 --- a/examples/full-cluster-tf-upgrade/1.34/main.tf +++ b/examples/full-cluster-tf-upgrade/1.34/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 07f56bf..ceed553 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 @@ -7,18 +7,27 @@ update to the AMI (to AL2023) and any charts or image changes. Copy files from 1.33/{path} to eks-{clustername}/{path} -* versions.tf -* addons/addons.tf +* main.tf +* charts.yml +* images.yml * addons/addons.yml + ## Update Files Update `cluster_version` from 1.32 to 1.33 in * settings.auto.tfvars -## Apply changes +Ensure `includes.d/parent_rs.tf` is correct. +If cluster is an upgrade, comment out `ebs-encryption.tf` line 50-58 the resource for `delete_default_sc` as it should already have been applied and will throw an error if not commented out. +Update `main.tf` line 112 -> resource "aws_eks_node_group" "eks-nodegroup" -> change the ami_type to `ami_type = "AL2023_x86_64_STANDARD"` +then on line 251 -> comment out the `user_data` on the resource "aws_launch_template" "eks-nodegroup" + +## Apply changes +NOTE: irsa-roles/ does not nav after tf-run, should go back to cluster folder and `tf-run apply 37` +NOTE: common-services/cluster-autoscaler does not nav after tf-run, go back to cluster folder and `tf-run apply 41` Apply in various directories where changes happened * (main) @@ -46,7 +55,11 @@ 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 + - ami updated from `AL2_x86_64` to `AL2023_x86_64_STANDARD` + - user data no longer required - add files to update - - addons/addons.tf + - main.tf + - charts.yml + - images.yml - addons/addons.yml