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

fix(ci): comment out LB listeners (for now) #3519

Merged
merged 2 commits into from
Dec 1, 2023
Merged

fix(ci): comment out LB listeners (for now) #3519

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
7eb9af5
fix(ci): comment out lb listeners for now
spypsy Dec 1, 2023
7fb35c5
Merge branch 'master' into spy/comment-out-lb-listener
PhilWindle Dec 1, 2023
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
40 changes: 20 additions & 20 deletions yarn-project/aztec-node/terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,23 +369,23 @@ resource "aws_security_group_rule" "allow-node-tcp" {
## NLB listeners can't have a 'weight' property defined. You will see there isn't one here but that doesn't
## stop it trying to automatically specify one and giving an error

resource "aws_lb_listener" "aztec-node-tcp-listener" {
count = local.node_count
load_balancer_arn = data.terraform_remote_state.aztec-network_iac.outputs.nlb_arn
port = var.NODE_TCP_PORT + count.index
protocol = "TCP"

tags = {
name = "aztec-node-${count.index}-tcp-listener"
}

default_action {
type = "forward"

forward {
target_group {
arn = aws_lb_target_group.aztec-bootstrap-target-group[count.index].arn
}
}
}
}
# resource "aws_lb_listener" "aztec-node-tcp-listener" {
# count = local.node_count
# load_balancer_arn = data.terraform_remote_state.aztec-network_iac.outputs.nlb_arn
# port = var.NODE_TCP_PORT + count.index
# protocol = "TCP"

# tags = {
# name = "aztec-node-${count.index}-tcp-listener"
# }

# default_action {
# type = "forward"

# forward {
# target_group {
# arn = aws_lb_target_group.aztec-bootstrap-target-group[count.index].arn
# }
# }
# }
# }
44 changes: 24 additions & 20 deletions yarn-project/p2p-bootstrap/terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,23 +224,27 @@ resource "aws_security_group_rule" "allow-bootstrap-tcp" {
security_group_id = data.terraform_remote_state.aztec-network_iac.outputs.p2p_security_group_id
}

resource "aws_lb_listener" "aztec-bootstrap-tcp-listener" {
count = local.bootnode_count
load_balancer_arn = data.terraform_remote_state.aztec-network_iac.outputs.nlb_arn
port = var.BOOTNODE_LISTEN_PORT + count.index
protocol = "TCP"

tags = {
name = "aztec-bootstrap-${count.index}-target-group"
}

default_action {
type = "forward"

forward {
target_group {
arn = aws_lb_target_group.aztec-bootstrap-target-group[count.index].arn
}
}
}
}
## Commented out here and setup manually as terraform (or the aws provider version we are using) has a bug
## NLB listeners can't have a 'weight' property defined. You will see there isn't one here but that doesn't
## stop it trying to automatically specify one and giving an error

# resource "aws_lb_listener" "aztec-bootstrap-tcp-listener" {
# count = local.bootnode_count
# load_balancer_arn = data.terraform_remote_state.aztec-network_iac.outputs.nlb_arn
# port = var.BOOTNODE_LISTEN_PORT + count.index
# protocol = "TCP"

# tags = {
# name = "aztec-bootstrap-${count.index}-target-group"
# }

# default_action {
# type = "forward"

# forward {
# target_group {
# arn = aws_lb_target_group.aztec-bootstrap-target-group[count.index].arn
# }
# }
# }
# }