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.

Sign up for GitHub

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

Jump to bottom

fix: disable internal router from bidding #6313

Merged
merged 2 commits into from
Jul 19, 2024
Merged

fix: disable internal router from bidding #6313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cb63db
fix: disable internal router from bidding
preethamr Jul 18, 2024
c886b37
fix: update tf deploy to remove router pub and sub resources
preethamr Jul 18, 2024
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
116 changes: 58 additions & 58 deletions ops/mainnet/prod/core/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,64 +22,64 @@ data "aws_route53_zone" "primary" {
zone_id = "Z03634792TWUEHHQ5L0YX"
}


module "router_subscriber" {
source = "../../../modules/service"
stage = var.stage
environment = var.environment
domain = var.domain
region = var.region
dd_api_key = var.dd_api_key
zone_id = data.aws_route53_zone.primary.zone_id
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
internal_lb = false
docker_image = var.full_image_name_router_subscriber
container_family = "router-subscriber"
health_check_path = "/ping"
container_port = 8080
loadbalancer_port = 80
cpu = 512
memory = 1024
instance_count = 3
timeout = 180
ingress_cdir_blocks = ["0.0.0.0/0"]
ingress_ipv6_cdir_blocks = []
service_security_groups = flatten([module.network.allow_all_sg, module.network.ecs_task_sg])
cert_arn = var.certificate_arn
container_env_vars = local.router_env_vars
}

module "router_publisher" {
source = "../../../modules/service"
stage = var.stage
environment = var.environment
domain = var.domain
region = var.region
dd_api_key = var.dd_api_key
zone_id = data.aws_route53_zone.primary.zone_id
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
internal_lb = false
docker_image = var.full_image_name_router_publisher
container_family = "router-publisher"
health_check_path = "/ping"
container_port = 8080
loadbalancer_port = 80
cpu = 1024
memory = 2048
instance_count = 1
timeout = 180
ingress_cdir_blocks = ["0.0.0.0/0"]
ingress_ipv6_cdir_blocks = []
service_security_groups = flatten([module.network.allow_all_sg, module.network.ecs_task_sg])
cert_arn = var.certificate_arn
container_env_vars = local.router_publisher_env_vars
}
# Disable DAO router from bidding
# module "router_subscriber" {
# source = "../../../modules/service"
# stage = var.stage
# environment = var.environment
# domain = var.domain
# region = var.region
# dd_api_key = var.dd_api_key
# zone_id = data.aws_route53_zone.primary.zone_id
# 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
# internal_lb = false
# docker_image = var.full_image_name_router_subscriber
# container_family = "router-subscriber"
# health_check_path = "/ping"
# container_port = 8080
# loadbalancer_port = 80
# cpu = 512
# memory = 1024
# instance_count = 3
# timeout = 180
# ingress_cdir_blocks = ["0.0.0.0/0"]
# ingress_ipv6_cdir_blocks = []
# service_security_groups = flatten([module.network.allow_all_sg, module.network.ecs_task_sg])
# cert_arn = var.certificate_arn
# container_env_vars = local.router_env_vars
# }

# module "router_publisher" {
# source = "../../../modules/service"
# stage = var.stage
# environment = var.environment
# domain = var.domain
# region = var.region
# dd_api_key = var.dd_api_key
# zone_id = data.aws_route53_zone.primary.zone_id
# 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
# internal_lb = false
# docker_image = var.full_image_name_router_publisher
# container_family = "router-publisher"
# health_check_path = "/ping"
# container_port = 8080
# loadbalancer_port = 80
# cpu = 1024
# memory = 2048
# instance_count = 1
# timeout = 180
# ingress_cdir_blocks = ["0.0.0.0/0"]
# ingress_ipv6_cdir_blocks = []
# service_security_groups = flatten([module.network.allow_all_sg, module.network.ecs_task_sg])
# cert_arn = var.certificate_arn
# container_env_vars = local.router_publisher_env_vars
# }

module "router_executor" {
source = "../../../modules/service"
Expand Down
26 changes: 14 additions & 12 deletions ops/mainnet/prod/core/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ output "sequencer-server-dns" {
value = module.sequencer_server.dns_name
}

output "router-subscriber-dns" {
value = module.router_subscriber.dns_name
}
output "router-publisher-dns" {
value = module.router_publisher.dns_name
}
// Disable DAO router from bidding
# output "router-subscriber-dns" {
# value = module.router_subscriber.dns_name
# }
# output "router-publisher-dns" {
# value = module.router_publisher.dns_name
# }

output "sequencer-server-service-endpoint" {
value = module.sequencer_server.service_endpoint
Expand All @@ -28,13 +29,14 @@ output "sequencer-subscriber-service-endpoint" {
value = module.sequencer_subscriber.service_endpoint
}

output "router-publisher-service-endpoint" {
value = module.router_publisher.service_endpoint
}
# Disable DAO router from bidding
# output "router-publisher-service-endpoint" {
# value = module.router_publisher.service_endpoint
# }

output "router-subscriber-service-endpoint" {
value = module.router_subscriber.service_endpoint
}
# output "router-subscriber-service-endpoint" {
# value = module.router_subscriber.service_endpoint
# }

output "router-executor-service-endpoint" {
value = module.router_executor.service_endpoint
Expand Down
Loading