Refactor compute-mig module for Terraform 1.3 (#931)

* wip: autoscaler * wip: fix autoscaler * wip: health check * wip: untested * wip: tests and examples missing * wip: examples * wip: consumers * blueprint tests * fast
GoogleCloudPlatform · Nov 1, 2022 · a30c186 · a30c186
1 parent d7e0af7
commit a30c186
Show file tree

Hide file tree

Showing 13 changed files with 1,010 additions and 807 deletions.
diff --git a/blueprints/networking/filtering-proxy/main.tf b/blueprints/networking/filtering-proxy/main.tf
@@ -165,33 +165,31 @@ module "squid-vm" {
 }
 
 module "squid-mig" {
-  count       = var.mig ? 1 : 0
-  source      = "../../../modules/compute-mig"
-  project_id  = module.project-host.project_id
-  location    = "${var.region}-b"
-  name        = "squid-mig"
-  target_size = 1
-  autoscaler_config = {
-    max_replicas                      = 10
-    min_replicas                      = 1
-    cooldown_period                   = 30
-    cpu_utilization_target            = 0.65
-    load_balancing_utilization_target = null
-    metric                            = null
+  count             = var.mig ? 1 : 0
+  source            = "../../../modules/compute-mig"
+  project_id        = module.project-host.project_id
+  location          = "${var.region}-b"
+  name              = "squid-mig"
+  instance_template = module.squid-vm.template.self_link
+  target_size       = 1
+  auto_healing_policies = {
+    initial_delay_sec = 60
   }
-  default_version = {
-    instance_template = module.squid-vm.template.self_link
-    name              = "default"
+  autoscaler_config = {
+    max_replicas    = 10
+    min_replicas    = 1
+    cooldown_period = 30
+    scaling_signals = {
+      cpu_utilization = {
+        target = 0.65
+      }
+    }
   }
   health_check_config = {
-    type    = "tcp"
-    check   = { port = 3128 }
-    config  = {}
-    logging = true
-  }
-  auto_healing_policies = {
-    health_check      = module.squid-mig.0.health_check.self_link
-    initial_delay_sec = 60
+    enable_logging = true
+    tcp = {
+      port = 3128
+    }
   }
 }
 

diff --git a/blueprints/networking/glb-and-armor/main.tf b/blueprints/networking/glb-and-armor/main.tf
@@ -153,22 +153,20 @@ module "vm_siege" {
 }
 
 module "mig_ew1" {
-  source     = "../../../modules/compute-mig"
-  project_id = module.project.project_id
-  location   = "europe-west1"
-  name       = "${local.prefix}europe-west1-mig"
-  regional   = true
-  default_version = {
-    instance_template = module.instance_template_ew1.template.self_link
-    name              = "default"
-  }
+  source            = "../../../modules/compute-mig"
+  project_id        = module.project.project_id
+  location          = "europe-west1"
+  name              = "${local.prefix}europe-west1-mig"
+  instance_template = module.instance_template_ew1.template.self_link
   autoscaler_config = {
-    max_replicas                      = 5
-    min_replicas                      = 1
-    cooldown_period                   = 45
-    cpu_utilization_target            = 0.8
-    load_balancing_utilization_target = null
-    metric                            = null
+    max_replicas    = 5
+    min_replicas    = 1
+    cooldown_period = 45
+    scaling_signals = {
+      cpu_utilization = {
+        target = 0.65
+      }
+    }
   }
   named_ports = {
     http = 80
@@ -179,22 +177,20 @@ module "mig_ew1" {
 }
 
 module "mig_ue1" {
-  source     = "../../../modules/compute-mig"
-  project_id = module.project.project_id
-  location   = "us-east1"
-  name       = "${local.prefix}us-east1-mig"
-  regional   = true
-  default_version = {
-    instance_template = module.instance_template_ue1.template.self_link
-    name              = "default"
-  }
+  source            = "../../../modules/compute-mig"
+  project_id        = module.project.project_id
+  location          = "us-east1"
+  name              = "${local.prefix}us-east1-mig"
+  instance_template = module.instance_template_ue1.template.self_link
   autoscaler_config = {
-    max_replicas                      = 5
-    min_replicas                      = 1
-    cooldown_period                   = 45
-    cpu_utilization_target            = 0.8
-    load_balancing_utilization_target = null
-    metric                            = null
+    max_replicas    = 5
+    min_replicas    = 1
+    cooldown_period = 45
+    scaling_signals = {
+      cpu_utilization = {
+        target = 0.65
+      }
+    }
   }
   named_ports = {
     http = 80

diff --git a/fast/stages/02-networking-nva/nva.tf b/fast/stages/02-networking-nva/nva.tf
@@ -15,7 +15,7 @@
  */
 
 locals {
-  # routing_config should be aligned to the NVA network interfaces - i.e. 
+  # routing_config should be aligned to the NVA network interfaces - i.e.
   # local.routing_config[0] sets up the first interface, and so on.
   routing_config = [
     {
@@ -94,27 +94,21 @@ module "nva-template" {
 }
 
 module "nva-mig" {
-  for_each    = local.nva_locality
-  source      = "../../../modules/compute-mig"
-  project_id  = module.landing-project.project_id
-  regional    = true
-  location    = each.value.region
-  name        = "nva-cos-${each.value.trigram}-${each.value.zone}"
-  target_size = 1
-  # FIXME: cycle
-  # auto_healing_policies = {
-  #   health_check      = module.nva-mig[each.key].health_check.self_link
-  #   initial_delay_sec = 30
-  # }
-  health_check_config = {
-    type    = "tcp"
-    check   = { port = 22 }
-    config  = {}
-    logging = true
+  for_each          = local.nva_locality
+  source            = "../../../modules/compute-mig"
+  project_id        = module.landing-project.project_id
+  location          = each.value.region
+  name              = "nva-cos-${each.value.trigram}-${each.value.zone}"
+  instance_template = module.nva-template[each.key].template.self_link
+  target_size       = 1
+  auto_healing_policies = {
+    initial_delay_sec = 30
   }
-  default_version = {
-    instance_template = module.nva-template[each.key].template.self_link
-    name              = "default"
+  health_check_config = {
+    enable_logging = true
+    tcp = {
+      port = 22
+    }
   }
 }