Skip to content

Commit

Permalink
fix(ci): comment out LB listeners (for now) (#3519)
Browse files Browse the repository at this point in the history
Please provide a paragraph or two giving a summary of the change,
including relevant motivation and context.

# Checklist:
Remove the checklist to signal you've completed it. Enable auto-merge if
the PR is ready to merge.
- [ ] If the pull request requires a cryptography review (e.g.
cryptographic algorithm implementations) I have added the 'crypto' tag.
- [ ] I have reviewed my diff in github, line by line and removed
unexpected formatting changes, testing logs, or commented-out code.
- [ ] Every change is related to the PR description.
- [ ] I have
[linked](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)
this pull request to relevant issues (if any exist).
  • Loading branch information
spypsy authored Dec 1, 2023
1 parent 2a38788 commit 640aabc
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 40 deletions.
40 changes: 20 additions & 20 deletions yarn-project/aztec-node/terraform/main.tf
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
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
# }
# }
# }
# }

0 comments on commit 640aabc

Please sign in to comment.