Merge branch 'master' into master

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## [20.31.5](https://github.com/terraform-aws-modules/terraform-aws-eks/compare/v20.31.4...v20.31.5) (2024-12-20)
+
+
+### Bug Fixes
+
+* Correct Auto Mode disable ([#3253](https://github.com/terraform-aws-modules/terraform-aws-eks/issues/3253)) ([2a6a57a](https://github.com/terraform-aws-modules/terraform-aws-eks/commit/2a6a57a9bb1c6563608985bbdbfb7f47eec971df))
+
 ## [20.31.4](https://github.com/terraform-aws-modules/terraform-aws-eks/compare/v20.31.3...v20.31.4) (2024-12-14)
 
 

main.tf

@@ -56,7 +56,7 @@ resource "aws_eks_cluster" "this" {
     for_each = length(var.cluster_compute_config) > 0 ? [var.cluster_compute_config] : []
 
     content {
-      enabled       = try(compute_config.value.enabled, null)
+      enabled       = local.auto_mode_enabled
       node_pools    = local.auto_mode_enabled ? try(compute_config.value.node_pools, []) : null
       node_role_arn = local.auto_mode_enabled && length(try(compute_config.value.node_pools, [])) > 0 ? try(compute_config.value.node_role_arn, aws_iam_role.eks_auto[0].arn, null) : null
     }
@@ -75,12 +75,9 @@ resource "aws_eks_cluster" "this" {
     for_each = local.create_outposts_local_cluster ? [] : [1]
 
     content {
-      dynamic "elastic_load_balancing" {
-        for_each = local.auto_mode_enabled ? [1] : []
+      elastic_load_balancing {
 
-        content {
-          enabled = local.auto_mode_enabled
-        }
+        enabled = local.auto_mode_enabled
       }
 
       ip_family         = var.cluster_ip_family
@@ -133,13 +130,9 @@ resource "aws_eks_cluster" "this" {
     }
   }
 
-  dynamic "storage_config" {
-    for_each = local.auto_mode_enabled ? [1] : []
-
-    content {
-      block_storage {
-        enabled = local.auto_mode_enabled
-      }
+  storage_config {
+    block_storage {
+      enabled = local.auto_mode_enabled
     }
   }