fix: Remove arguments that do not make sense in EKS

Author: bryantbiggs

README.md

@@ -127,10 +127,8 @@ module "self_managed_node_group" {
 | <a name="input_enabled_metrics"></a> [enabled\_metrics](#input\_enabled\_metrics) | A list of metrics to collect. The allowed values are `GroupDesiredCapacity`, `GroupInServiceCapacity`, `GroupPendingCapacity`, `GroupMinSize`, `GroupMaxSize`, `GroupInServiceInstances`, `GroupPendingInstances`, `GroupStandbyInstances`, `GroupStandbyCapacity`, `GroupTerminatingCapacity`, `GroupTerminatingInstances`, `GroupTotalCapacity`, `GroupTotalInstances` | `list(string)` | `[]` | no |
 | <a name="input_enclave_options"></a> [enclave\_options](#input\_enclave\_options) | Enable Nitro Enclaves on launched instances | <pre>object({<br/>    enabled = optional(bool)<br/>  })</pre> | `null` | no |
 | <a name="input_force_delete"></a> [force\_delete](#input\_force\_delete) | Allows deleting the Auto Scaling Group without waiting for all instances in the pool to terminate. You can force an Auto Scaling Group to delete even if it's in the process of scaling a resource. Normally, Terraform drains all the instances before deleting the group. This bypasses that behavior and potentially leaves resources dangling | `bool` | `null` | no |
-| <a name="input_force_delete_warm_pool"></a> [force\_delete\_warm\_pool](#input\_force\_delete\_warm\_pool) | Allows deleting the Auto Scaling Group without waiting for all instances in the warm pool to terminate | `bool` | `null` | no |
 | <a name="input_health_check_grace_period"></a> [health\_check\_grace\_period](#input\_health\_check\_grace\_period) | Time (in seconds) after instance comes into service before checking health | `number` | `null` | no |
 | <a name="input_health_check_type"></a> [health\_check\_type](#input\_health\_check\_type) | `EC2` or `ELB`. Controls how health checking is done | `string` | `null` | no |
-| <a name="input_hibernation_options"></a> [hibernation\_options](#input\_hibernation\_options) | The hibernation options for the instance | <pre>object({<br/>    configured = optional(bool)<br/>  })</pre> | `null` | no |
 | <a name="input_iam_instance_profile_arn"></a> [iam\_instance\_profile\_arn](#input\_iam\_instance\_profile\_arn) | Amazon Resource Name (ARN) of an existing IAM instance profile that provides permissions for the node group. Required if `create_iam_instance_profile` = `false` | `string` | `null` | no |
 | <a name="input_iam_role_additional_policies"></a> [iam\_role\_additional\_policies](#input\_iam\_role\_additional\_policies) | Additional policies to be added to the IAM role | `map(string)` | `{}` | no |
 | <a name="input_iam_role_arn"></a> [iam\_role\_arn](#input\_iam\_role\_arn) | ARN of the IAM role used by the instance profile. Required when `create_access_entry = true` and `create_iam_instance_profile = false` | `string` | `null` | no |
@@ -200,7 +198,6 @@ module "self_managed_node_group" {
 | <a name="input_vpc_security_group_ids"></a> [vpc\_security\_group\_ids](#input\_vpc\_security\_group\_ids) | A list of security group IDs to associate | `list(string)` | `[]` | no |
 | <a name="input_wait_for_capacity_timeout"></a> [wait\_for\_capacity\_timeout](#input\_wait\_for\_capacity\_timeout) | A maximum duration that Terraform should wait for ASG instances to be healthy before timing out. (See also Waiting for Capacity below.) Setting this to '0' causes Terraform to skip all Capacity Waiting behavior | `string` | `null` | no |
 | <a name="input_wait_for_elb_capacity"></a> [wait\_for\_elb\_capacity](#input\_wait\_for\_elb\_capacity) | Setting this will cause Terraform to wait for exactly this number of healthy instances in all attached load balancers on both create and update operations. Takes precedence over `min_elb_capacity` behavior | `number` | `null` | no |
-| <a name="input_warm_pool"></a> [warm\_pool](#input\_warm\_pool) | If this block is configured, add a Warm Pool to the specified Auto Scaling group | <pre>object({<br/>    instance_reuse_policy = optional(object({<br/>      reuse_on_scale_in = optional(bool)<br/>    }))<br/>    max_group_prepared_capacity = optional(number)<br/>    min_size                    = optional(number)<br/>    pool_state                  = optional(string)<br/>  })</pre> | `null` | no |
 
 ## Outputs
 

modules/self-managed-node-group/README.md

@@ -191,14 +191,6 @@ resource "aws_launch_template" "this" {
     }
   }
 
-  dynamic "hibernation_options" {
-    for_each = var.hibernation_options != null ? [var.hibernation_options] : []
-
-    content {
-      configured = hibernation_options.value.configured
-    }
-  }
-
   iam_instance_profile {
     arn = var.create_iam_instance_profile ? aws_iam_instance_profile.this[0].arn : var.iam_instance_profile_arn
   }
@@ -500,7 +492,6 @@ resource "aws_autoscaling_group" "this" {
   desired_capacity_type     = var.desired_size_type
   enabled_metrics           = var.enabled_metrics
   force_delete              = var.force_delete
-  force_delete_warm_pool    = var.force_delete_warm_pool
   health_check_grace_period = var.health_check_grace_period
   health_check_type         = var.health_check_type
 
@@ -773,24 +764,6 @@ resource "aws_autoscaling_group" "this" {
   wait_for_capacity_timeout = var.wait_for_capacity_timeout
   wait_for_elb_capacity     = var.wait_for_elb_capacity
 
-  dynamic "warm_pool" {
-    for_each = var.warm_pool != null ? [var.warm_pool] : []
-
-    content {
-      dynamic "instance_reuse_policy" {
-        for_each = warm_pool.value.instance_reuse_policy != null ? [warm_pool.value.instance_reuse_policy] : []
-
-        content {
-          reuse_on_scale_in = instance_reuse_policy.value.reuse_on_scale_in
-        }
-      }
-
-      max_group_prepared_capacity = warm_pool.value.max_group_prepared_capacity
-      min_size                    = warm_pool.value.min_size
-      pool_state                  = warm_pool.value.pool_state
-    }
-  }
-
   dynamic "timeouts" {
     for_each = var.timeouts != null ? [var.timeouts] : []
 

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

@@ -237,14 +237,6 @@ variable "enclave_options" {
   default = null
 }
 
-variable "hibernation_options" {
-  description = "The hibernation options for the instance"
-  type = object({
-    configured = optional(bool)
-  })
-  default = null
-}
-
 variable "instance_market_options" {
   description = "The market (purchasing) option for the instance"
   type = object({
@@ -651,12 +643,6 @@ variable "force_delete" {
   default     = null
 }
 
-variable "force_delete_warm_pool" {
-  description = "Allows deleting the Auto Scaling Group without waiting for all instances in the warm pool to terminate"
-  type        = bool
-  default     = null
-}
-
 variable "termination_policies" {
   description = "A list of policies to decide how the instances in the Auto Scaling Group should be terminated. The allowed values are `OldestInstance`, `NewestInstance`, `OldestLaunchConfiguration`, `ClosestToNextInstanceHour`, `OldestLaunchTemplate`, `AllocationStrategy`, `Default`"
   type        = list(string)
@@ -829,19 +815,6 @@ variable "mixed_instances_policy" {
   default = null
 }
 
-variable "warm_pool" {
-  description = "If this block is configured, add a Warm Pool to the specified Auto Scaling group"
-  type = object({
-    instance_reuse_policy = optional(object({
-      reuse_on_scale_in = optional(bool)
-    }))
-    max_group_prepared_capacity = optional(number)
-    min_size                    = optional(number)
-    pool_state                  = optional(string)
-  })
-  default = null
-}
-
 variable "timeouts" {
   description = "Timeout configurations for the autoscaling group"
   type = object({

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

@@ -424,11 +424,10 @@ module "self_managed_node_group" {
 
   ignore_failed_scaling_activities = try(each.value.ignore_failed_scaling_activities, var.self_managed_node_group_defaults.ignore_failed_scaling_activities, null)
 
-  force_delete           = try(each.value.force_delete, var.self_managed_node_group_defaults.force_delete, null)
-  force_delete_warm_pool = try(each.value.force_delete_warm_pool, var.self_managed_node_group_defaults.force_delete_warm_pool, null)
-  termination_policies   = try(each.value.termination_policies, var.self_managed_node_group_defaults.termination_policies, null)
-  suspended_processes    = try(each.value.suspended_processes, var.self_managed_node_group_defaults.suspended_processes, null)
-  max_instance_lifetime  = try(each.value.max_instance_lifetime, var.self_managed_node_group_defaults.max_instance_lifetime, null)
+  force_delete          = try(each.value.force_delete, var.self_managed_node_group_defaults.force_delete, null)
+  termination_policies  = try(each.value.termination_policies, var.self_managed_node_group_defaults.termination_policies, null)
+  suspended_processes   = try(each.value.suspended_processes, var.self_managed_node_group_defaults.suspended_processes, null)
+  max_instance_lifetime = try(each.value.max_instance_lifetime, var.self_managed_node_group_defaults.max_instance_lifetime, null)
 
   enabled_metrics         = try(each.value.enabled_metrics, var.self_managed_node_group_defaults.enabled_metrics, null)
   metrics_granularity     = try(each.value.metrics_granularity, var.self_managed_node_group_defaults.metrics_granularity, null)
@@ -439,7 +438,6 @@ module "self_managed_node_group" {
   instance_refresh            = try(each.value.instance_refresh, var.self_managed_node_group_defaults.instance_refresh, null)
   use_mixed_instances_policy  = try(each.value.use_mixed_instances_policy, var.self_managed_node_group_defaults.use_mixed_instances_policy, null)
   mixed_instances_policy      = try(each.value.mixed_instances_policy, var.self_managed_node_group_defaults.mixed_instances_policy, null)
-  warm_pool                   = try(each.value.warm_pool, var.self_managed_node_group_defaults.warm_pool, null)
 
   timeouts               = try(each.value.timeouts, var.self_managed_node_group_defaults.timeouts, null)
   autoscaling_group_tags = try(each.value.autoscaling_group_tags, var.self_managed_node_group_defaults.autoscaling_group_tags, null)
@@ -486,7 +484,6 @@ module "self_managed_node_group" {
   cpu_options                        = try(each.value.cpu_options, var.self_managed_node_group_defaults.cpu_options, null)
   credit_specification               = try(each.value.credit_specification, var.self_managed_node_group_defaults.credit_specification, null)
   enclave_options                    = try(each.value.enclave_options, var.self_managed_node_group_defaults.enclave_options, null)
-  hibernation_options                = try(each.value.hibernation_options, var.self_managed_node_group_defaults.hibernation_options, null)
   instance_requirements              = try(each.value.instance_requirements, var.self_managed_node_group_defaults.instance_requirements, null)
   instance_market_options            = try(each.value.instance_market_options, var.self_managed_node_group_defaults.instance_market_options, null)
   license_specifications             = try(each.value.license_specifications, var.self_managed_node_group_defaults.license_specifications, null)

node_groups.tf

@@ -1058,9 +1058,6 @@ variable "self_managed_node_groups" {
     enclave_options = optional(object({
       enabled = optional(bool)
     }))
-    hibernation_options = optional(object({
-      configured = optional(bool)
-    }))
     instance_requirements = optional(object({
       accelerator_count = optional(object({
         max = optional(number)
@@ -1294,7 +1291,6 @@ variable "self_managed_node_group_defaults" {
     health_check_grace_period        = optional(number)
     ignore_failed_scaling_activities = optional(number)
     force_delete                     = optional(bool)
-    force_delete_warm_pool           = optional(bool)
     termination_policies             = optional(list(string))
     suspended_processes              = optional(list(string))
     max_instance_lifetime            = optional(number)
@@ -1407,14 +1403,6 @@ variable "self_managed_node_group_defaults" {
         })))
       })
     }))
-    warm_pool = optional(object({
-      instance_reuse_policy = optional(object({
-        reuse_on_scale_in = optional(bool)
-      }))
-      max_group_prepared_capacity = optional(number)
-      min_size                    = optional(number)
-      pool_state                  = optional(string)
-    }))
     timeouts = optional(object({
       delete = optional(string)
     }))
@@ -1491,9 +1479,6 @@ variable "self_managed_node_group_defaults" {
     enclave_options = optional(object({
       enabled = optional(bool)
     }))
-    hibernation_options = optional(object({
-      configured = optional(bool)
-    }))
     instance_requirements = optional(object({
       accelerator_count = optional(object({
         max = optional(number)