fix: Updates from testing and validating self-managed node group

Author: bryantbiggs

docs/UPGRADE-21.0.md

@@ -208,7 +208,7 @@ module "eks" {
   version = "~> 20.0"
 
   # Truncated for brevity ...
-  # Not all renamed variables are shown here, please refer to the full list above.
+  # Renamed variables are not shown here, please refer to the full list above.
 
   enable_efa_support = true
 
@@ -269,7 +269,7 @@ module "eks" {
   version = "~> 21.0"
 
   # Truncated for brevity ...
-  # Not all renamed variables are shown here, please refer to the full list above.
+  # Renamed variables are not shown here, please refer to the full list above.
 
   eks_managed_node_groups = {
     efa = {
@@ -323,3 +323,5 @@ module "eks" {
 ```
 
 ### State Changes
+
+No state changes required.

modules/self-managed-node-group/main.tf

@@ -423,17 +423,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(aws_placement_group.this[0].name, placement.value.group_name)
-      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)
     }
   }
 

tests/self-managed-node-group/main.tf

@@ -45,13 +45,15 @@ module "eks" {
       most_recent = true
     }
     eks-pod-identity-agent = {
-      most_recent = true
+      before_compute = true
+      most_recent    = true
     }
     kube-proxy = {
       most_recent = true
     }
     vpc-cni = {
-      most_recent = true
+      before_compute = true
+      most_recent    = true
       pod_identity_association = [{
         role_arn        = module.aws_vpc_cni_ipv4_pod_identity.iam_role_arn
         service_account = "aws-node"