Skip to content

Commit 170ea31

Browse files
authored
feat: Add launch_template_tags variable for additional launch template tags (#1835)
1 parent 29ad53d commit 170ea31

File tree

7 files changed

+18
-2
lines changed

7 files changed

+18
-2
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ module "eks_managed_node_group" {
129129
| <a name="input_launch_template_default_version"></a> [launch\_template\_default\_version](#input\_launch\_template\_default\_version) | Default version of the launch template | `string` | `null` | no |
130130
| <a name="input_launch_template_description"></a> [launch\_template\_description](#input\_launch\_template\_description) | Description of the launch template | `string` | `null` | no |
131131
| <a name="input_launch_template_name"></a> [launch\_template\_name](#input\_launch\_template\_name) | Launch template name - either to be created (`var.create_launch_template` = `true`) or existing (`var.create_launch_template` = `false`) | `string` | `""` | no |
132+
| <a name="input_launch_template_tags"></a> [launch\_template\_tags](#input\_launch\_template\_tags) | A map of additional tags to add to the tag\_specifications of launch template created | `map(string)` | `{}` | no |
132133
| <a name="input_launch_template_use_name_prefix"></a> [launch\_template\_use\_name\_prefix](#input\_launch\_template\_use\_name\_prefix) | Determines whether to use `launch_template_name` as is or create a unique name beginning with the `launch_template_name` as the prefix | `bool` | `true` | no |
133134
| <a name="input_launch_template_version"></a> [launch\_template\_version](#input\_launch\_template\_version) | Launch template version number. The default is `$Default` | `string` | `null` | no |
134135
| <a name="input_license_specifications"></a> [license\_specifications](#input\_license\_specifications) | A list of license specifications to associate with | `map(string)` | `null` | no |

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ resource "aws_launch_template" "this" {
238238
for_each = toset(["instance", "volume", "network-interface"])
239239
content {
240240
resource_type = tag_specifications.key
241-
tags = merge(var.tags, { Name = var.name })
241+
tags = merge(var.tags, { Name = var.name }, var.launch_template_tags)
242242
}
243243
}
244244

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

+6
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,12 @@ variable "placement" {
238238
default = null
239239
}
240240

241+
variable "launch_template_tags" {
242+
description = "A map of additional tags to add to the tag_specifications of launch template created"
243+
type = map(string)
244+
default = {}
245+
}
246+
241247
################################################################################
242248
# EKS Managed Node Group
243249
################################################################################

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

+1
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ module "self_managed_node_group" {
128128
| <a name="input_launch_template_default_version"></a> [launch\_template\_default\_version](#input\_launch\_template\_default\_version) | Default Version of the launch template | `string` | `null` | no |
129129
| <a name="input_launch_template_description"></a> [launch\_template\_description](#input\_launch\_template\_description) | Description of the launch template | `string` | `null` | no |
130130
| <a name="input_launch_template_name"></a> [launch\_template\_name](#input\_launch\_template\_name) | Launch template name - either to be created (`var.create_launch_template` = `true`) or existing (`var.create_launch_template` = `false`) | `string` | `null` | no |
131+
| <a name="input_launch_template_tags"></a> [launch\_template\_tags](#input\_launch\_template\_tags) | A map of additional tags to add to the tag\_specifications of launch template created | `map(string)` | `{}` | no |
131132
| <a name="input_launch_template_use_name_prefix"></a> [launch\_template\_use\_name\_prefix](#input\_launch\_template\_use\_name\_prefix) | Determines whether to use `launch_template_name` as is or create a unique name beginning with the `launch_template_name` as the prefix | `bool` | `true` | no |
132133
| <a name="input_launch_template_version"></a> [launch\_template\_version](#input\_launch\_template\_version) | Launch template version. Can be version number, `$Latest`, or `$Default` | `string` | `null` | no |
133134
| <a name="input_license_specifications"></a> [license\_specifications](#input\_license\_specifications) | A list of license specifications to associate with | `map(string)` | `null` | no |

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ resource "aws_launch_template" "this" {
229229
for_each = toset(["instance", "volume", "network-interface"])
230230
content {
231231
resource_type = tag_specifications.key
232-
tags = merge(var.tags, { Name = var.name })
232+
tags = merge(var.tags, { Name = var.name }, var.launch_template_tags)
233233
}
234234
}
235235

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

+6
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,12 @@ variable "metadata_options" {
250250
}
251251
}
252252

253+
variable "launch_template_tags" {
254+
description = "A map of additional tags to add to the tag_specifications of launch template created"
255+
type = map(string)
256+
default = {}
257+
}
258+
253259
################################################################################
254260
# Autoscaling group
255261
################################################################################

node_groups.tf

+2
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ module "eks_managed_node_group" {
273273
launch_template_use_name_prefix = try(each.value.launch_template_use_name_prefix, var.eks_managed_node_group_defaults.launch_template_use_name_prefix, true)
274274
launch_template_version = try(each.value.launch_template_version, var.eks_managed_node_group_defaults.launch_template_version, null)
275275
launch_template_description = try(each.value.launch_template_description, var.eks_managed_node_group_defaults.launch_template_description, "Custom launch template for ${try(each.value.name, each.key)} EKS managed node group")
276+
launch_template_tags = try(each.value.launch_template_tags, var.eks_managed_node_group_defaults.launch_template_tags, {})
276277

277278
ebs_optimized = try(each.value.ebs_optimized, var.eks_managed_node_group_defaults.ebs_optimized, null)
278279
key_name = try(each.value.key_name, var.eks_managed_node_group_defaults.key_name, null)
@@ -390,6 +391,7 @@ module "self_managed_node_group" {
390391
launch_template_use_name_prefix = try(each.value.launch_template_use_name_prefix, var.self_managed_node_group_defaults.launch_template_use_name_prefix, true)
391392
launch_template_version = try(each.value.launch_template_version, var.self_managed_node_group_defaults.launch_template_version, null)
392393
launch_template_description = try(each.value.launch_template_description, var.self_managed_node_group_defaults.launch_template_description, "Custom launch template for ${try(each.value.name, each.key)} self managed node group")
394+
launch_template_tags = try(each.value.launch_template_tags, var.self_managed_node_group_defaults.launch_template_tags, {})
393395

394396
ebs_optimized = try(each.value.ebs_optimized, var.self_managed_node_group_defaults.ebs_optimized, null)
395397
ami_id = try(each.value.ami_id, var.self_managed_node_group_defaults.ami_id, "")

0 commit comments

Comments
 (0)