Skip to content

Commit b2ffb33

Browse files
surminusnpalm
authored andcommitted
Allow passing in additional security groups
This allows passing in additional security groups IDs to the launch template. We have a setup where we use a bastion host to connect to our instances, and would like to apply the same configuration to the runners.
1 parent ada72ac commit b2ffb33

File tree

4 files changed

+27
-11
lines changed

4 files changed

+27
-11
lines changed

main.tf

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,17 @@ module "runners" {
7474
ami_filter = local.ami_filter
7575
ami_owners = var.ami_owners
7676

77-
sqs_build_queue = aws_sqs_queue.queued_builds
78-
github_app = var.github_app
79-
enable_organization_runners = var.enable_organization_runners
80-
scale_down_schedule_expression = var.scale_down_schedule_expression
81-
minimum_running_time_in_minutes = var.minimum_running_time_in_minutes
82-
runner_extra_labels = var.runner_extra_labels
83-
runner_as_root = var.runner_as_root
84-
runners_maximum_count = var.runners_maximum_count
85-
idle_config = var.idle_config
86-
enable_ssm_on_runners = var.enable_ssm_on_runners
77+
sqs_build_queue = aws_sqs_queue.queued_builds
78+
github_app = var.github_app
79+
enable_organization_runners = var.enable_organization_runners
80+
scale_down_schedule_expression = var.scale_down_schedule_expression
81+
minimum_running_time_in_minutes = var.minimum_running_time_in_minutes
82+
runner_extra_labels = var.runner_extra_labels
83+
runner_as_root = var.runner_as_root
84+
runners_maximum_count = var.runners_maximum_count
85+
idle_config = var.idle_config
86+
enable_ssm_on_runners = var.enable_ssm_on_runners
87+
runner_additional_security_group_ids = var.runner_additional_security_group_ids
8788

8889
lambda_s3_bucket = var.lambda_s3_bucket
8990
runners_lambda_s3_key = var.runners_lambda_s3_key

modules/runners/main.tf

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,10 @@ resource "aws_launch_template" "runner" {
6262
image_id = data.aws_ami.runner.id
6363
instance_type = var.instance_type
6464

65-
vpc_security_group_ids = [aws_security_group.runner_sg.id]
65+
vpc_security_group_ids = compact(concat(
66+
[aws_security_group.runner_sg.id],
67+
var.runner_additional_security_group_ids,
68+
))
6669

6770
tag_specifications {
6871
resource_type = "instance"

modules/runners/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,3 +278,9 @@ variable "runner_log_files" {
278278
}
279279
]
280280
}
281+
282+
variable "runner_additional_security_group_ids" {
283+
description = "(optional) List of additional security groups IDs to apply to the runner"
284+
type = list(string)
285+
default = []
286+
}

variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,3 +296,9 @@ variable "runner_log_files" {
296296
}
297297
]
298298
}
299+
300+
variable "runner_additional_security_group_ids" {
301+
description = "(optional) List of additional security groups IDs to apply to the runner"
302+
type = list(string)
303+
default = []
304+
}

0 commit comments

Comments
 (0)