Skip to content

Commit 532226e

Browse files
feat: Enable support for ignore_failed_scaling_activities (#3104)
* feat(issue-3102): added support for ignore_failed_scaling_activities Signed-off-by: ivan katliarchuk <[email protected]> * Update node_groups.tf Co-authored-by: Bryant Biggs <[email protected]> * Update modules/self-managed-node-group/variables.tf Co-authored-by: Bryant Biggs <[email protected]> * feat(issue-3102): pre-commit checks sorted Signed-off-by: ivan katliarchuk <[email protected]> --------- Signed-off-by: ivan katliarchuk <[email protected]> Co-authored-by: Bryant Biggs <[email protected]>
1 parent 1fed91a commit 532226e

File tree

4 files changed

+11
-0
lines changed

4 files changed

+11
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ module "self_managed_node_group" {
140140
| <a name="input_iam_role_policy_statements"></a> [iam\_role\_policy\_statements](#input\_iam\_role\_policy\_statements) | A list of IAM policy [statements](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document#statement) - used for adding specific IAM permissions as needed | `any` | `[]` | no |
141141
| <a name="input_iam_role_tags"></a> [iam\_role\_tags](#input\_iam\_role\_tags) | A map of additional tags to add to the IAM role created | `map(string)` | `{}` | no |
142142
| <a name="input_iam_role_use_name_prefix"></a> [iam\_role\_use\_name\_prefix](#input\_iam\_role\_use\_name\_prefix) | Determines whether cluster IAM role name (`iam_role_name`) is used as a prefix | `bool` | `true` | no |
143+
| <a name="input_ignore_failed_scaling_activities"></a> [ignore\_failed\_scaling\_activities](#input\_ignore\_failed\_scaling\_activities) | Whether to ignore failed Auto Scaling scaling activities while waiting for capacity. | `bool` | `null` | no |
143144
| <a name="input_initial_lifecycle_hooks"></a> [initial\_lifecycle\_hooks](#input\_initial\_lifecycle\_hooks) | One or more Lifecycle Hooks to attach to the Auto Scaling Group before instances are launched. The syntax is exactly the same as the separate `aws_autoscaling_lifecycle_hook` resource, without the `autoscaling_group_name` attribute. Please note that this will only work when creating a new Auto Scaling Group. For all other use-cases, please use `aws_autoscaling_lifecycle_hook` resource | `list(map(string))` | `[]` | no |
144145
| <a name="input_instance_initiated_shutdown_behavior"></a> [instance\_initiated\_shutdown\_behavior](#input\_instance\_initiated\_shutdown\_behavior) | Shutdown behavior for the instance. Can be `stop` or `terminate`. (Default: `stop`) | `string` | `null` | no |
145146
| <a name="input_instance_maintenance_policy"></a> [instance\_maintenance\_policy](#input\_instance\_maintenance\_policy) | If this block is configured, add a instance maintenance policy to the specified Auto Scaling group | `any` | `{}` | no |

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -565,6 +565,8 @@ resource "aws_autoscaling_group" "this" {
565565
min_elb_capacity = var.min_elb_capacity
566566
min_size = var.min_size
567567

568+
ignore_failed_scaling_activities = var.ignore_failed_scaling_activities
569+
568570
dynamic "mixed_instances_policy" {
569571
for_each = var.use_mixed_instances_policy ? [var.mixed_instances_policy] : []
570572

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,12 @@ variable "desired_size" {
408408
default = 1
409409
}
410410

411+
variable "ignore_failed_scaling_activities" {
412+
description = "Whether to ignore failed Auto Scaling scaling activities while waiting for capacity."
413+
type = bool
414+
default = null
415+
}
416+
411417
variable "context" {
412418
description = "Reserved"
413419
type = string

node_groups.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,8 @@ module "self_managed_node_group" {
448448
health_check_type = try(each.value.health_check_type, var.self_managed_node_group_defaults.health_check_type, null)
449449
health_check_grace_period = try(each.value.health_check_grace_period, var.self_managed_node_group_defaults.health_check_grace_period, null)
450450

451+
ignore_failed_scaling_activities = try(each.value.ignore_failed_scaling_activities, var.self_managed_node_group_defaults.ignore_failed_scaling_activities, null)
452+
451453
force_delete = try(each.value.force_delete, var.self_managed_node_group_defaults.force_delete, null)
452454
force_delete_warm_pool = try(each.value.force_delete_warm_pool, var.self_managed_node_group_defaults.force_delete_warm_pool, null)
453455
termination_policies = try(each.value.termination_policies, var.self_managed_node_group_defaults.termination_policies, [])

0 commit comments

Comments
 (0)