Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow configuring additional security groups #392

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,17 @@ module "runners" {
ami_filter = local.ami_filter
ami_owners = var.ami_owners

sqs_build_queue = aws_sqs_queue.queued_builds
github_app = var.github_app
enable_organization_runners = var.enable_organization_runners
scale_down_schedule_expression = var.scale_down_schedule_expression
minimum_running_time_in_minutes = var.minimum_running_time_in_minutes
runner_extra_labels = var.runner_extra_labels
runner_as_root = var.runner_as_root
runners_maximum_count = var.runners_maximum_count
idle_config = var.idle_config
enable_ssm_on_runners = var.enable_ssm_on_runners
sqs_build_queue = aws_sqs_queue.queued_builds
github_app = var.github_app
enable_organization_runners = var.enable_organization_runners
scale_down_schedule_expression = var.scale_down_schedule_expression
minimum_running_time_in_minutes = var.minimum_running_time_in_minutes
runner_extra_labels = var.runner_extra_labels
runner_as_root = var.runner_as_root
runners_maximum_count = var.runners_maximum_count
idle_config = var.idle_config
enable_ssm_on_runners = var.enable_ssm_on_runners
runner_additional_security_group_ids = var.runner_additional_security_group_ids

lambda_s3_bucket = var.lambda_s3_bucket
runners_lambda_s3_key = var.runners_lambda_s3_key
Expand Down
5 changes: 4 additions & 1 deletion modules/runners/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@ resource "aws_launch_template" "runner" {
image_id = data.aws_ami.runner.id
instance_type = var.instance_type

vpc_security_group_ids = [aws_security_group.runner_sg.id]
vpc_security_group_ids = compact(concat(
[aws_security_group.runner_sg.id],
var.runner_additional_security_group_ids,
))

tag_specifications {
resource_type = "instance"
Expand Down
6 changes: 6 additions & 0 deletions modules/runners/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -278,3 +278,9 @@ variable "runner_log_files" {
}
]
}

variable "runner_additional_security_group_ids" {
description = "(optional) List of additional security groups IDs to apply to the runner"
type = list(string)
default = []
}
6 changes: 6 additions & 0 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -296,3 +296,9 @@ variable "runner_log_files" {
}
]
}

variable "runner_additional_security_group_ids" {
description = "(optional) List of additional security groups IDs to apply to the runner"
type = list(string)
default = []
}