From 4c16e08a806514ec3ba221500ab77d4f5789f55d Mon Sep 17 00:00:00 2001 From: Robert Fairburn <8029478+rfairburn@users.noreply.github.com> Date: Fri, 5 Jan 2024 14:01:41 -0600 Subject: [PATCH] Update dogfood to use new downtime migrations (#15935) This should be put in place prior to pushing the release or an RC to dogfood. --- infrastructure/dogfood/terraform/aws-tf-module/free.tf | 7 +++++-- infrastructure/dogfood/terraform/aws-tf-module/main.tf | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/infrastructure/dogfood/terraform/aws-tf-module/free.tf b/infrastructure/dogfood/terraform/aws-tf-module/free.tf index fb9ce97cf2..2804a830e3 100644 --- a/infrastructure/dogfood/terraform/aws-tf-module/free.tf +++ b/infrastructure/dogfood/terraform/aws-tf-module/free.tf @@ -15,7 +15,7 @@ locals { } module "free" { - source = "github.com/fleetdm/fleet//terraform/byo-vpc?ref=tf-mod-byo-vpc-v1.7.1" + source = "github.com/fleetdm/fleet//terraform/byo-vpc?ref=tf-mod-byo-vpc-v1.8.0" vpc_config = { name = local.customer_free vpc_id = module.main.vpc.vpc_id @@ -131,10 +131,13 @@ module "migrations_free" { depends_on = [ module.geolite2 ] - source = "github.com/fleetdm/fleet//terraform/addons/migrations?ref=tf-mod-addon-migrations-v1.0.0" + source = "github.com/fleetdm/fleet//terraform/addons/migrations?ref=tf-mod-addon-migrations-v2.0.0" ecs_cluster = module.free.byo-db.byo-ecs.service.cluster task_definition = module.free.byo-db.byo-ecs.task_definition.family task_definition_revision = module.free.byo-db.byo-ecs.task_definition.revision subnets = module.free.byo-db.byo-ecs.service.network_configuration[0].subnets security_groups = module.free.byo-db.byo-ecs.service.network_configuration[0].security_groups + ecs_service = module.free.byo-db.byo-ecs.service.name + desired_count = module.free.byo-db.byo-ecs.appautoscaling_target.min_capacity + min_capacity = module.free.byo-db.byo-ecs.appautoscaling_target.min_capacity } diff --git a/infrastructure/dogfood/terraform/aws-tf-module/main.tf b/infrastructure/dogfood/terraform/aws-tf-module/main.tf index 6d6671457d..f4f6bd5eeb 100644 --- a/infrastructure/dogfood/terraform/aws-tf-module/main.tf +++ b/infrastructure/dogfood/terraform/aws-tf-module/main.tf @@ -63,7 +63,7 @@ locals { } module "main" { - source = "github.com/fleetdm/fleet//terraform?ref=tf-mod-root-v1.6.1" + source = "github.com/fleetdm/fleet//terraform?ref=tf-mod-root-v1.7.0" certificate_arn = module.acm.acm_certificate_arn vpc = { name = local.customer @@ -243,12 +243,15 @@ module "migrations" { depends_on = [ module.geolite2 ] - source = "github.com/fleetdm/fleet//terraform/addons/migrations?ref=tf-mod-addon-migrations-v1.0.0" + source = "github.com/fleetdm/fleet//terraform/addons/migrations?ref=tf-mod-addon-migrations-v2.0.0" ecs_cluster = module.main.byo-vpc.byo-db.byo-ecs.service.cluster task_definition = module.main.byo-vpc.byo-db.byo-ecs.task_definition.family task_definition_revision = module.main.byo-vpc.byo-db.byo-ecs.task_definition.revision subnets = module.main.byo-vpc.byo-db.byo-ecs.service.network_configuration[0].subnets security_groups = module.main.byo-vpc.byo-db.byo-ecs.service.network_configuration[0].security_groups + ecs_service = module.main.byo-vpc.byo-db.byo-ecs.service.name + desired_count = module.main.byo-vpc.byo-db.byo-ecs.appautoscaling_target.min_capacity + min_capacity = module.main.byo-vpc.byo-db.byo-ecs.appautoscaling_target.min_capacity } module "mdm" {