fix: Set target_size to null when autoscaling is enabled in MIG (#65)

ali-sattari · web-flow · commit dd7146642a74 · 2020-02-03T11:27:17.000-05:00
* Fixes #64 Signed-off-by: Ali Sattari <ali.sattari@gmail.com> * plz work Signed-off-by: Ali Sattari <ali.sattari@gmail.com> * Adding some pause for MIG to spinup new instances that match min_replicas Signed-off-by: Ali Sattari <ali.sattari@gmail.com>
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -55,6 +55,10 @@ suites:
       command_timeout: 1800
       root_module_directory: test/fixtures/mig/simple
   - name: mig_autoscaler
+    lifecycle:
+      pre_verify:
+        # Wait for instances to be created
+        - local: sleep 300
     driver:
       name: terraform
       command_timeout: 1800
diff --git a/autogen/main.tf.tmpl b/autogen/main.tf.tmpl
@@ -71,7 +71,7 @@ resource "google_compute_region_instance_group_manager" "{{ module_name }}" {
     }
   }
   target_pools = var.target_pools
-  target_size  = var.autoscaling_enabled ? var.min_replicas : var.target_size
+  target_size  = var.autoscaling_enabled ? null : var.target_size
 
   dynamic "auto_healing_policies" {
     for_each = local.healthchecks
diff --git a/modules/mig/main.tf b/modules/mig/main.tf
@@ -53,7 +53,7 @@ resource "google_compute_region_instance_group_manager" "mig" {
     }
   }
   target_pools = var.target_pools
-  target_size  = var.autoscaling_enabled ? var.min_replicas : var.target_size
+  target_size  = var.autoscaling_enabled ? null : var.target_size
 
   dynamic "auto_healing_policies" {
     for_each = local.healthchecks
diff --git a/modules/mig_with_percent/main.tf b/modules/mig_with_percent/main.tf
@@ -61,7 +61,7 @@ resource "google_compute_region_instance_group_manager" "mig_with_percent" {
     }
   }
   target_pools = var.target_pools
-  target_size  = var.autoscaling_enabled ? var.min_replicas : var.target_size
+  target_size  = var.autoscaling_enabled ? null : var.target_size
 
   dynamic "auto_healing_policies" {
     for_each = local.healthchecks

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ resource "google_compute_region_instance_group_manager" "{{ module_name }}" {`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`	`target_pools = var.target_pools`
`74`		`- target_size = var.autoscaling_enabled ? var.min_replicas : var.target_size`
	`74`	`+ target_size = var.autoscaling_enabled ? null : var.target_size`
`75`	`75`
`76`	`76`	`dynamic "auto_healing_policies" {`
`77`	`77`	`for_each = local.healthchecks`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ resource "google_compute_region_instance_group_manager" "mig" {`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`target_pools = var.target_pools`
`56`		`- target_size = var.autoscaling_enabled ? var.min_replicas : var.target_size`
	`56`	`+ target_size = var.autoscaling_enabled ? null : var.target_size`
`57`	`57`
`58`	`58`	`dynamic "auto_healing_policies" {`
`59`	`59`	`for_each = local.healthchecks`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ resource "google_compute_region_instance_group_manager" "mig_with_percent" {`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`	`target_pools = var.target_pools`
`64`		`- target_size = var.autoscaling_enabled ? var.min_replicas : var.target_size`
	`64`	`+ target_size = var.autoscaling_enabled ? null : var.target_size`
`65`	`65`
`66`	`66`	`dynamic "auto_healing_policies" {`
`67`	`67`	`for_each = local.healthchecks`