From 2b1d9b6424fd58f3ab17312cb77a7710608db908 Mon Sep 17 00:00:00 2001 From: Niek Palm Date: Tue, 22 Apr 2025 23:30:46 +0200 Subject: [PATCH 1/2] fix: only tag spot rquests for spot --- modules/runners/main.tf | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/modules/runners/main.tf b/modules/runners/main.tf index fe624f256c..621b887504 100644 --- a/modules/runners/main.tf +++ b/modules/runners/main.tf @@ -206,18 +206,21 @@ resource "aws_launch_template" "runner" { ) } - tag_specifications { - resource_type = "spot-instances-request" - tags = merge( - local.tags, - { - "Name" = format("%s", local.name_runner) - }, - { - "ghr:runner_name_prefix" = var.runner_name_prefix - }, - var.runner_ec2_tags - ) + dynamic "tag_specifications" { + for_each = var.instance_target_capacity_type == "spot" ? 1 : 0 + content { + resource_type = "spot-instances-request" + tags = merge( + local.tags, + { + "Name" = format("%s", local.name_runner) + }, + { + "ghr:runner_name_prefix" = var.runner_name_prefix + }, + var.runner_ec2_tags + ) + } } tag_specifications { From 76f663c99fd3e61603c0b24785f07eae83e8d78c Mon Sep 17 00:00:00 2001 From: Niek Palm Date: Tue, 22 Apr 2025 23:34:03 +0200 Subject: [PATCH 2/2] fix: only tag spot rquests for spot --- modules/runners/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/runners/main.tf b/modules/runners/main.tf index 621b887504..c3d1d1bbe2 100644 --- a/modules/runners/main.tf +++ b/modules/runners/main.tf @@ -207,7 +207,7 @@ resource "aws_launch_template" "runner" { } dynamic "tag_specifications" { - for_each = var.instance_target_capacity_type == "spot" ? 1 : 0 + for_each = var.instance_target_capacity_type == "spot" ? [1] : [] # Include the block only if the value is "spot" content { resource_type = "spot-instances-request" tags = merge(