From 640aabc414876a3dacb5287e2705380a9fafca9f Mon Sep 17 00:00:00 2001 From: spypsy Date: Fri, 1 Dec 2023 18:51:23 +0000 Subject: [PATCH] fix(ci): comment out LB listeners (for now) (#3519) 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). --- yarn-project/aztec-node/terraform/main.tf | 40 +++++++++--------- yarn-project/p2p-bootstrap/terraform/main.tf | 44 +++++++++++--------- 2 files changed, 44 insertions(+), 40 deletions(-) diff --git a/yarn-project/aztec-node/terraform/main.tf b/yarn-project/aztec-node/terraform/main.tf index c0e7a17d833..5d1b767e364 100644 --- a/yarn-project/aztec-node/terraform/main.tf +++ b/yarn-project/aztec-node/terraform/main.tf @@ -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 +# } +# } +# } +# } diff --git a/yarn-project/p2p-bootstrap/terraform/main.tf b/yarn-project/p2p-bootstrap/terraform/main.tf index 35462c6c24d..43925bd5b29 100644 --- a/yarn-project/p2p-bootstrap/terraform/main.tf +++ b/yarn-project/p2p-bootstrap/terraform/main.tf @@ -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 +# } +# } +# } +# }