Page MenuHomePhabricator
Files F2911680

D9177.id31025.diff
No OneTemporary
Actions

D9177.id31025.diff
View Options

diff --git a/services/terraform/remote/service_blob.tf b/services/terraform/remote/service_blob.tf
--- a/services/terraform/remote/service_blob.tf
+++ b/services/terraform/remote/service_blob.tf
@@ -173,26 +173,8 @@
certificate_arn = data.aws_acm_certificate.blob_service.arn
default_action {
- type = "forward"
-
- # TODO: Currently weights are set to direct 100% traffic
- # to the legacy instance
- forward {
- # ECS target group
- target_group {
- arn = aws_lb_target_group.blob_service_http.arn
- weight = 1
- }
-
- # Legacy EC2 Target
- dynamic "target_group" {
- for_each = data.aws_lb_target_group.blob_service_legacy_ec2
- content {
- arn = target_group.value["arn"]
- weight = 0
- }
- }
- }
+ type = "forward"
+ target_group_arn = aws_lb_target_group.blob_service_http.arn
}
lifecycle {
@@ -210,13 +192,6 @@
statuses = ["ISSUED"]
}
-# Legacy EC2 instance target
-data "aws_lb_target_group" "blob_service_legacy_ec2" {
- # We don't have legacy EC2 services in staging
- count = local.is_staging ? 0 : 1
- name = "blob-service-http-tg"
-}
-
# Required for Route53 DNS record
output "blob_service_load_balancer_dns_name" {
value = aws_lb.blob_service.dns_name
diff --git a/services/terraform/remote/service_electron_update.tf b/services/terraform/remote/service_electron_update.tf
--- a/services/terraform/remote/service_electron_update.tf
+++ b/services/terraform/remote/service_electron_update.tf
@@ -158,23 +158,8 @@
certificate_arn = data.aws_acm_certificate.electron_update.arn
default_action {
- type = "forward"
- forward {
- # ECS target group
- target_group {
- arn = aws_lb_target_group.electron_update_ecs.arn
- weight = 10
- }
-
- # Legacy EC2 Target
- dynamic "target_group" {
- for_each = data.aws_lb_target_group.electron_update_legacy_ec2
- content {
- arn = target_group.value["arn"]
- weight = 0
- }
- }
- }
+ type = "forward"
+ target_group_arn = aws_lb_target_group.electron_update_ecs.arn
}
lifecycle {
@@ -189,13 +174,6 @@
statuses = ["ISSUED"]
}
-# Legacy EC2 instance target
-data "aws_lb_target_group" "electron_update_legacy_ec2" {
- # We don't have legacy EC2 services in staging
- count = local.is_staging ? 0 : 1
- name = "electron-update-tg"
-}
-
# Required for Route53 DNS record
output "electron_update_load_balancer_dns_name" {
value = aws_lb.electron_update.dns_name
diff --git a/services/terraform/remote/service_feature_flags.tf b/services/terraform/remote/service_feature_flags.tf
--- a/services/terraform/remote/service_feature_flags.tf
+++ b/services/terraform/remote/service_feature_flags.tf
@@ -164,24 +164,8 @@
certificate_arn = data.aws_acm_certificate.feature_flags.arn
default_action {
- type = "forward"
-
- forward {
- # ECS target group
- target_group {
- arn = aws_lb_target_group.feature_flags_ecs.arn
- weight = 10
- }
-
- # Legacy EC2 Target
- dynamic "target_group" {
- for_each = data.aws_lb_target_group.feature_flags_legacy_ec2
- content {
- arn = target_group.value["arn"]
- weight = 0
- }
- }
- }
+ type = "forward"
+ target_group_arn = aws_lb_target_group.feature_flags_ecs.arn
}
lifecycle {
@@ -196,13 +180,6 @@
statuses = ["ISSUED"]
}
-# Legacy EC2 instance target
-data "aws_lb_target_group" "feature_flags_legacy_ec2" {
- # We don't have legacy EC2 services in staging
- count = local.is_staging ? 0 : 1
- name = "feature-flags-service-tg"
-}
-
# Required for Route53 DNS record
output "feature_flags_load_balancer_dns_name" {
value = aws_lb.feature_flags.dns_name
diff --git a/services/terraform/remote/service_identity.tf b/services/terraform/remote/service_identity.tf
--- a/services/terraform/remote/service_identity.tf
+++ b/services/terraform/remote/service_identity.tf
@@ -185,22 +185,8 @@
certificate_arn = data.aws_acm_certificate.identity_service.arn
default_action {
- type = "forward"
- forward {
- # ECS target group
- target_group {
- arn = aws_lb_target_group.identity_service_grpc.arn
- weight = 1
- }
- # Legacy EC2 Target
- dynamic "target_group" {
- for_each = data.aws_lb_target_group.identity_service_legacy_ec2
- content {
- arn = target_group.value["arn"]
- weight = 0
- }
- }
- }
+ type = "forward"
+ target_group_arn = aws_lb_target_group.identity_service_grpc.arn
}
lifecycle {
@@ -218,13 +204,6 @@
statuses = ["ISSUED"]
}
-# Legacy EC2 instance target
-data "aws_lb_target_group" "identity_service_legacy_ec2" {
- # We don't have legacy EC2 services in staging
- count = local.is_staging ? 0 : 1
- name = "identity-service-tg"
-}
-
# Required for Route53 DNS record
output "identity_service_load_balancer_dns_name" {
value = aws_lb.identity_service.dns_name

File Metadata

Mime Type
text/plain
Expires
Tue, Oct 8, 12:23 AM (21 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2257195
Default Alt Text
D9177.id31025.diff (5 KB)

Event Timeline