From 999e615e7ef3322aaef3ade4f01a7dd9543bf782 Mon Sep 17 00:00:00 2001 From: konkerama Date: Fri, 11 Apr 2025 16:29:40 +0300 Subject: [PATCH 1/3] feat: added launch template tag_specifications --- modules/runners/main.tf | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/modules/runners/main.tf b/modules/runners/main.tf index 051d6713cd..7b275b6d30 100644 --- a/modules/runners/main.tf +++ b/modules/runners/main.tf @@ -176,6 +176,32 @@ resource "aws_launch_template" "runner" { var.runner_ec2_tags ) } + 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 + ) + } + tag_specifications { + resource_type = "network-interface" + tags = merge( + local.tags, + { + "Name" = format("%s", local.name_runner) + }, + { + "ghr:runner_name_prefix" = var.runner_name_prefix + }, + var.runner_ec2_tags + ) + } user_data = var.runner_os == "windows" ? base64encode(local.user_data) : base64gzip(local.user_data) From 3804b7be105d410b9ebc70263adcc42d75695f15 Mon Sep 17 00:00:00 2001 From: konkerama Date: Fri, 11 Apr 2025 16:30:29 +0300 Subject: [PATCH 2/3] upd fmt --- modules/runners/main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/runners/main.tf b/modules/runners/main.tf index 7b275b6d30..3a43b79584 100644 --- a/modules/runners/main.tf +++ b/modules/runners/main.tf @@ -189,6 +189,7 @@ resource "aws_launch_template" "runner" { var.runner_ec2_tags ) } + tag_specifications { resource_type = "network-interface" tags = merge( From 05c91090051590bd7ee4252ae43f483e2da9dd12 Mon Sep 17 00:00:00 2001 From: Niek Palm Date: Wed, 16 Apr 2025 13:40:26 +0200 Subject: [PATCH 3/3] fix formatting --- modules/runners/main.tf | 1 + modules/runners/pool/main.tf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/runners/main.tf b/modules/runners/main.tf index 602223b485..fe624f256c 100644 --- a/modules/runners/main.tf +++ b/modules/runners/main.tf @@ -205,6 +205,7 @@ resource "aws_launch_template" "runner" { var.runner_ec2_tags ) } + tag_specifications { resource_type = "spot-instances-request" tags = merge( diff --git a/modules/runners/pool/main.tf b/modules/runners/pool/main.tf index a10bdd042a..49ab15b2c1 100644 --- a/modules/runners/pool/main.tf +++ b/modules/runners/pool/main.tf @@ -189,7 +189,7 @@ resource "aws_iam_role" "scheduler" { permissions_boundary = var.config.role_permissions_boundary assume_role_policy = data.aws_iam_policy_document.scheduler_assume.json - tags = var.config.tags + tags = var.config.tags } resource "aws_iam_role_policy" "scheduler" {