Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Drop asg_recreate_on_change feature to encourage the usage of Instance Refresh for EC2 Auto Scaling #1360

Merged
merged 1 commit into from
May 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion local.tf
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ locals {
asg_min_size = "1" # Minimum worker capacity in the autoscaling group. NOTE: Change in this paramater will affect the asg_desired_capacity, like changing its value to 2 will change asg_desired_capacity value to 2 but bringing back it to 1 will not affect the asg_desired_capacity.
asg_force_delete = false # Enable forced deletion for the autoscaling group.
asg_initial_lifecycle_hooks = [] # Initital lifecycle hook for the autoscaling group.
asg_recreate_on_change = false # Recreate the autoscaling group when the Launch Template or Launch Configuration change.
default_cooldown = null # The amount of time, in seconds, after a scaling activity completes before another scaling activity can start.
health_check_type = null # Controls how health checking is done. Valid values are "EC2" or "ELB".
health_check_grace_period = null # Time in seconds after instance comes into service before checking health.
Expand Down
18 changes: 1 addition & 17 deletions workers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ resource "aws_autoscaling_group" "workers" {
compact(
[
coalescelist(aws_eks_cluster.this[*].name, [""])[0],
lookup(var.worker_groups[count.index], "name", count.index),
lookup(var.worker_groups[count.index], "asg_recreate_on_change", local.workers_group_defaults["asg_recreate_on_change"]) ? random_pet.workers[count.index].id : ""
lookup(var.worker_groups[count.index], "name", count.index)
]
)
)
Expand Down Expand Up @@ -326,21 +325,6 @@ resource "aws_launch_configuration" "workers" {
]
}

resource "random_pet" "workers" {
count = var.create_eks ? local.worker_group_count : 0

separator = "-"
length = 2

keepers = {
lc_name = aws_launch_configuration.workers[count.index].name
}

lifecycle {
create_before_destroy = true
}
}

resource "aws_security_group" "workers" {
count = var.worker_create_security_group && var.create_eks ? 1 : 0
name_prefix = var.cluster_name
Expand Down
26 changes: 1 addition & 25 deletions workers_launch_template.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ resource "aws_autoscaling_group" "workers_launch_template" {
compact(
[
coalescelist(aws_eks_cluster.this[*].name, [""])[0],
lookup(var.worker_groups_launch_template[count.index], "name", count.index),
lookup(var.worker_groups_launch_template[count.index], "asg_recreate_on_change", local.workers_group_defaults["asg_recreate_on_change"]) ? random_pet.workers_launch_template[count.index].id : ""
lookup(var.worker_groups_launch_template[count.index], "name", count.index)
]
)
)
Expand Down Expand Up @@ -531,29 +530,6 @@ resource "aws_launch_template" "workers_launch_template" {
]
}

resource "random_pet" "workers_launch_template" {
count = var.create_eks ? local.worker_group_launch_template_count : 0

separator = "-"
length = 2

keepers = {
lt_name = join(
"-",
compact(
[
aws_launch_template.workers_launch_template[count.index].name,
aws_launch_template.workers_launch_template[count.index].latest_version
]
)
)
}

lifecycle {
create_before_destroy = true
}
}

resource "aws_iam_instance_profile" "workers_launch_template" {
count = var.manage_worker_iam_resources && var.create_eks ? local.worker_group_launch_template_count : 0
name_prefix = coalescelist(aws_eks_cluster.this[*].name, [""])[0]
Expand Down