chore: Stash changes from testing

bryantbiggs · bryantbiggs · commit 7032a96ea0ef · 2025-07-17T16:22:30.000-05:00
diff --git a/docs/compute_resources.md b/docs/compute_resources.md
@@ -73,8 +73,6 @@ Refer to the [EKS Managed Node Group documentation](https://docs.aws.amazon.com/
             kubelet:
               config:
                 shutdownGracePeriod: 30s
-                featureGates:
-                  DisableKubeletCloudCredentialProviders: true
         EOT
         content_type = "application/node.eks.aws"
       }]
diff --git a/examples/eks-managed-node-group/eks-al2023.tf b/examples/eks-managed-node-group/eks-al2023.tf
@@ -42,8 +42,6 @@ module "eks_al2023" {
               kubelet:
                 config:
                   shutdownGracePeriod: 30s
-                  featureGates:
-                    DisableKubeletCloudCredentialProviders: true
           EOT
         }
       ]
diff --git a/examples/self-managed-node-group/eks-al2023.tf b/examples/self-managed-node-group/eks-al2023.tf
@@ -41,8 +41,6 @@ module "eks_al2023" {
               kubelet:
                 config:
                   shutdownGracePeriod: 30s
-                  featureGates:
-                    DisableKubeletCloudCredentialProviders: true
           EOT
         }
       ]
diff --git a/modules/eks-managed-node-group/main.tf b/modules/eks-managed-node-group/main.tf
@@ -305,17 +305,17 @@ resource "aws_launch_template" "this" {
   }
 
   dynamic "placement" {
-    for_each = length(var.placement) > 0 || local.create_placement_group ? [var.placement] : []
+    for_each = var.placement != null || local.create_placement_group ? [var.placement] : []
 
     content {
-      affinity                = placement.value.affinity
-      availability_zone       = placement.value.availability_zone
+      affinity                = try(placement.value.affinity, null)
+      availability_zone       = try(placement.value.availability_zone, null)
       group_name              = try(coalesce(aws_placement_group.this[0].name, placement.value.group_name), null)
-      host_id                 = placement.value.host_id
-      host_resource_group_arn = placement.value.host_resource_group_arn
-      partition_number        = placement.value.partition_number
-      spread_domain           = placement.value.spread_domain
-      tenancy                 = placement.value.tenancy
+      host_id                 = try(placement.value.host_id, null)
+      host_resource_group_arn = try(placement.value.host_resource_group_arn, null)
+      partition_number        = try(placement.value.partition_number, null)
+      spread_domain           = try(placement.value.spread_domain, null)
+      tenancy                 = try(placement.value.tenancy, null)
     }
   }
 
diff --git a/modules/eks-managed-node-group/variables.tf b/modules/eks-managed-node-group/variables.tf
@@ -391,7 +391,7 @@ variable "placement" {
     spread_domain           = optional(string)
     tenancy                 = optional(string)
   })
-  default = {}
+  default = null
 }
 
 variable "create_placement_group" {
@@ -436,7 +436,7 @@ variable "subnet_ids" {
 variable "min_size" {
   description = "Minimum number of instances/nodes"
   type        = number
-  default     = 0
+  default     = 1
 }
 
 variable "max_size" {
diff --git a/modules/self-managed-node-group/variables.tf b/modules/self-managed-node-group/variables.tf
@@ -326,7 +326,7 @@ variable "placement" {
     spread_domain           = optional(string)
     tenancy                 = optional(string)
   })
-  default = {}
+  default = null
 }
 
 variable "create_placement_group" {
@@ -548,7 +548,7 @@ variable "subnet_ids" {
 variable "min_size" {
   description = "The minimum size of the autoscaling group"
   type        = number
-  default     = 0
+  default     = 1
 }
 
 variable "max_size" {
diff --git a/node_groups.tf b/node_groups.tf
@@ -319,12 +319,12 @@ module "eks_managed_node_group" {
   create_launch_template                 = try(each.value.create_launch_template, null)
   use_custom_launch_template             = try(each.value.use_custom_launch_template, null)
   launch_template_id                     = try(each.value.launch_template_id, null)
-  launch_template_name                   = try(each.value.launch_template_name, each.key)
+  launch_template_name                   = coalesce(each.value.launch_template_name, each.key)
   launch_template_use_name_prefix        = try(each.value.launch_template_use_name_prefix, null)
   launch_template_version                = try(each.value.launch_template_version, null)
   launch_template_default_version        = try(each.value.launch_template_default_version, null)
   update_launch_template_default_version = try(each.value.update_launch_template_default_version, null)
-  launch_template_description            = try(each.value.launch_template_description, "Custom launch template for ${try(each.value.name, each.key)} EKS managed node group")
+  launch_template_description            = coalesce(each.value.launch_template_description, "Custom launch template for ${coalesce(each.value.name, each.key)} EKS managed node group")
   launch_template_tags                   = try(each.value.launch_template_tags, null)
   tag_specifications                     = try(each.value.tag_specifications, null)
 
@@ -461,12 +461,12 @@ module "self_managed_node_group" {
   # Launch Template
   create_launch_template                 = try(each.value.create_launch_template, null)
   launch_template_id                     = try(each.value.launch_template_id, null)
-  launch_template_name                   = try(each.value.launch_template_name, each.key)
+  launch_template_name                   = coalesce(each.value.launch_template_name, each.key)
   launch_template_use_name_prefix        = try(each.value.launch_template_use_name_prefix, null)
   launch_template_version                = try(each.value.launch_template_version, null)
   launch_template_default_version        = try(each.value.launch_template_default_version, null)
   update_launch_template_default_version = try(each.value.update_launch_template_default_version, null)
-  launch_template_description            = try(each.value.launch_template_description, "Custom launch template for ${try(each.value.name, each.key)} self managed node group")
+  launch_template_description            = coalesce(each.value.launch_template_description, "Custom launch template for ${coalesce(each.value.name, each.key)} self managed node group")
   launch_template_tags                   = try(each.value.launch_template_tags, null)
   tag_specifications                     = try(each.value.tag_specifications, null)
 
diff --git a/tests/eks-managed-node-group/main.tf b/tests/eks-managed-node-group/main.tf
@@ -126,8 +126,6 @@ module "eks" {
               kubelet:
                 config:
                   shutdownGracePeriod: 30s
-                  featureGates:
-                    DisableKubeletCloudCredentialProviders: true
           EOT
         }
       ]
@@ -229,8 +227,6 @@ module "eks" {
             kubelet:
               config:
                 shutdownGracePeriod: 30s
-                featureGates:
-                  DisableKubeletCloudCredentialProviders: true
         EOT
         content_type = "application/node.eks.aws"
       }]
diff --git a/tests/self-managed-node-group/main.tf b/tests/self-managed-node-group/main.tf
@@ -228,8 +228,6 @@ module "eks" {
             kubelet:
               config:
                 shutdownGracePeriod: 30s
-                featureGates:
-                  DisableKubeletCloudCredentialProviders: true
         EOT
           content_type = "application/node.eks.aws"
         }]
diff --git a/variables.tf b/variables.tf
@@ -789,7 +789,7 @@ variable "self_managed_node_groups" {
     use_name_prefix                  = optional(bool, true)
     availability_zones               = optional(list(string))
     subnet_ids                       = optional(list(string))
-    min_size                         = optional(number, 0)
+    min_size                         = optional(number, 1)
     max_size                         = optional(number, 3)
     desired_size                     = optional(number, 1)
     desired_size_type                = optional(string)
@@ -1118,7 +1118,7 @@ variable "self_managed_node_groups" {
       partition_number        = optional(number)
       spread_domain           = optional(string)
       tenancy                 = optional(string)
-    }), {})
+    }))
     maintenance_options = optional(object({
       auto_recovery = optional(string)
     }))
@@ -1216,7 +1216,7 @@ variable "eks_managed_node_groups" {
     name                           = optional(string) # Will fall back to map key
     use_name_prefix                = optional(bool, true)
     subnet_ids                     = optional(list(string))
-    min_size                       = optional(number, 0)
+    min_size                       = optional(number, 1)
     max_size                       = optional(number, 3)
     desired_size                   = optional(number, 1)
     ami_id                         = optional(string, "")
@@ -1357,7 +1357,7 @@ variable "eks_managed_node_groups" {
       partition_number        = optional(number)
       spread_domain           = optional(string)
       tenancy                 = optional(string)
-    }), {})
+    }))
     network_interfaces = optional(list(object({
       associate_carrier_ip_address = optional(bool)
       associate_public_ip_address  = optional(bool)

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,6 @@ module "eks_al2023" {`
`42`	`42`	`kubelet:`
`43`	`43`	`config:`
`44`	`44`	`shutdownGracePeriod: 30s`
`45`		`- featureGates:`
`46`		`- DisableKubeletCloudCredentialProviders: true`
`47`	`45`	`EOT`
`48`	`46`	`}`
`49`	`47`	`]`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,6 @@ module "eks_al2023" {`
`41`	`41`	`kubelet:`
`42`	`42`	`config:`
`43`	`43`	`shutdownGracePeriod: 30s`
`44`		`- featureGates:`
`45`		`- DisableKubeletCloudCredentialProviders: true`
`46`	`44`	`EOT`
`47`	`45`	`}`
`48`	`46`	`]`