Merge pull request #5010 from connext/main

ci: sync testnet-prod with main
connext · Oct 14, 2023 · 157702c · 157702c
2 parents 066cfe0 + 9da3cf5
commit 157702c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/ops/testnet/prod/core/main.tf b/ops/testnet/prod/core/main.tf
@@ -301,9 +301,12 @@ module "lighthouse_prover_cron" {
   container_env_vars = merge(local.lighthouse_env_vars, {
     LIGHTHOUSE_SERVICE = "prover-pub"
   })
-  schedule_expression = "rate(5 minutes)"
-  timeout             = 300
-  memory_size         = 10240
+  schedule_expression    = "rate(5 minutes)"
+  timeout                = 300
+  memory_size            = 10240
+  lambda_in_vpc          = true
+  subnet_ids             = module.network.private_subnets
+  lambda_security_groups = flatten([module.network.allow_all_sg, module.network.ecs_task_sg])
 }
 
 module "lighthouse_prover_subscriber" {
@@ -425,7 +428,7 @@ module "relayer_web3signer" {
   execution_role_arn       = data.aws_iam_role.ecr_admin_role.arn
   cluster_id               = module.ecs.ecs_cluster_id
   vpc_id                   = module.network.vpc_id
-  lb_subnets               = module.network.public_subnets
+  lb_subnets               = module.network.private_subnets
   docker_image             = "ghcr.io/connext/web3signer:latest"
   container_family         = "relayer-web3signer"
   health_check_path        = "/upcheck"

diff --git a/ops/testnet/staging/core/main.tf b/ops/testnet/staging/core/main.tf
@@ -329,15 +329,18 @@ module "lighthouse_prover_subscriber_auto_scaling" {
 }
 
 module "lighthouse_prover_cron" {
-  source              = "../../../modules/lambda"
-  ecr_repository_name = "nxtp-lighthouse"
-  docker_image_tag    = var.lighthouse_image_tag
-  container_family    = "lighthouse-prover"
-  environment         = var.environment
-  stage               = var.stage
-  container_env_vars  = merge(local.lighthouse_env_vars, { LIGHTHOUSE_SERVICE = "prover" })
-  schedule_expression = "rate(30 minutes)"
-  memory_size         = 512
+  source                 = "../../../modules/lambda"
+  ecr_repository_name    = "nxtp-lighthouse"
+  docker_image_tag       = var.lighthouse_image_tag
+  container_family       = "lighthouse-prover"
+  environment            = var.environment
+  stage                  = var.stage
+  container_env_vars     = merge(local.lighthouse_env_vars, { LIGHTHOUSE_SERVICE = "prover" })
+  schedule_expression    = "rate(30 minutes)"
+  memory_size            = 512
+  lambda_in_vpc          = true
+  subnet_ids             = module.network.private_subnets
+  lambda_security_groups = flatten([module.network.allow_all_sg, module.network.ecs_task_sg])
 }
 
 module "lighthouse_process_from_root_cron" {