Skip to content

Commit d17007b

Browse files
authored
fix: Fixed launch template version infinite plan issue and improved rolling updates (#1447)
1 parent 4f683ab commit d17007b

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

modules/node_groups/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ The role ARN specified in `var.default_iam_role_arn` will be used by default. In
4848
| subnets | Subnets to contain workers | list(string) | `var.workers_group_defaults[subnets]` |
4949
| version | Kubernetes version | string | Provider default behavior |
5050
| taints | Kubernetes node taints | list(map) | empty |
51+
| update_default_version | Whether or not to set the new launch template version the Default | bool | `true` |
5152

5253
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
5354
## Requirements

modules/node_groups/launch_template.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ resource "aws_launch_template" "workers" {
2727

2828
name_prefix = local.node_groups_names[each.key]
2929
description = format("EKS Managed Node Group custom LT for %s", local.node_groups_names[each.key])
30-
update_default_version = true
30+
update_default_version = lookup(each.value, "update_default_version", true)
3131

3232
block_device_mappings {
3333
device_name = "/dev/xvda"

modules/node_groups/locals.tf

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ locals {
2424
pre_userdata = var.workers_group_defaults["pre_userdata"]
2525
additional_security_group_ids = var.workers_group_defaults["additional_security_group_ids"]
2626
taints = []
27+
update_default_version = true
2728
ebs_optimized = null
2829
},
2930
var.node_groups_defaults,

modules/node_groups/node_groups.tf

+4-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@ resource "aws_eks_node_group" "workers" {
4747

4848
dynamic "launch_template" {
4949
for_each = each.value["launch_template_id"] == null && each.value["create_launch_template"] ? [{
50-
id = aws_launch_template.workers[each.key].id
51-
version = each.value["launch_template_version"]
50+
id = aws_launch_template.workers[each.key].id
51+
version = each.value["launch_template_version"] == "$Latest" ? aws_launch_template.workers[each.key].latest_version : (
52+
each.value["launch_template_version"] == "$Default" ? aws_launch_template.workers[each.key].default_version : each.value["launch_template_version"]
53+
)
5254
}] : []
5355

5456
content {

0 commit comments

Comments
 (0)