Skip to content

Commit

Permalink
Fixing networking issues (#4099)
Browse files Browse the repository at this point in the history
This issue will fix the issue pytorch/pytorch#100545
  • Loading branch information
jeanschmidt authored May 4, 2023
1 parent 960eab1 commit 92814df
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 7 deletions.
6 changes: 2 additions & 4 deletions terraform-aws-github-runner/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,8 @@ module "runners" {
lambda_timeout_scale_down = var.runners_scale_down_lambda_timeout
lambda_subnet_ids = var.lambda_subnet_ids

lambda_security_group_ids = concat(
var.lambda_security_group_ids,
[module.runners_instances.security_groups_ids_vpcs[0]]
)
lambda_security_group_ids = var.lambda_security_group_ids
runners_security_group_ids = module.runners_instances.security_groups_ids_vpcs
github_app_key_base64 = module.runners_instances.github_app_key_base64
github_app_client_secret = module.runners_instances.github_app_client_secret
role_runner_arn = module.runners_instances.role_runner_arn
Expand Down
5 changes: 4 additions & 1 deletion terraform-aws-github-runner/modules/runners/scale-down.tf
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@ resource "aws_lambda_function" "scale_down" {
}

vpc_config {
security_group_ids = var.lambda_security_group_ids
security_group_ids = concat(
var.lambda_security_group_ids,
[var.runners_security_group_ids[0]]
)
subnet_ids = var.lambda_subnet_ids
}
}
Expand Down
7 changes: 5 additions & 2 deletions terraform-aws-github-runner/modules/runners/scale-up.tf
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ resource "aws_lambda_function" "scale_up" {
format(
"%s|%s",
vpc.vpc,
var.lambda_security_group_ids[local.vpc_id_to_idx[vpc.vpc]]
var.runners_security_group_ids[local.vpc_id_to_idx[vpc.vpc]]
)
],
[
Expand All @@ -91,7 +91,10 @@ resource "aws_lambda_function" "scale_up" {
}

vpc_config {
security_group_ids = var.lambda_security_group_ids
security_group_ids = concat(
var.lambda_security_group_ids,
[var.runners_security_group_ids[0]]
)
subnet_ids = var.lambda_subnet_ids
}
}
Expand Down
6 changes: 6 additions & 0 deletions terraform-aws-github-runner/modules/runners/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,12 @@ variable "lambda_security_group_ids" {
default = []
}

variable "runners_security_group_ids" {
description = "Security groups"
type = list(string)
default = []
}

variable "secretsmanager_secrets_id" {
description = "(optional) ID for secretsmanager secret to use for Github App credentials"
type = string
Expand Down

0 comments on commit 92814df

Please sign in to comment.