Merge branch 'main' into SECURITY_metadata_options

Gryff · web-flow · commit 98355be6b306 · 2023-10-24T11:12:59.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,9 +2,13 @@
 
 BACKWARDS INCOMPATIBILITIES / NOTES:
 
+
 * IMDSv2 support is now on by default, this can be changed via the new
   `cluster_instance_metadata_options` variable which mirrors 
   aws_launch_template's [metadata_options](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/launch_template#metadata-options)
+* The `cluster_desired_capacity` is now ignored after the first `apply` of the
+  module since, in the case of autoscaling or manual scaling, the value may have
+  changed between `apply`s.
 
 ## 6.0.0 (February 22th 2023)
 
diff --git a/asg.tf b/asg.tf
@@ -107,5 +107,8 @@ resource "aws_autoscaling_group" "cluster" {
 
   lifecycle {
     create_before_destroy = true
+    ignore_changes = [
+      desired_capacity
+    ]
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -107,5 +107,8 @@ resource "aws_autoscaling_group" "cluster" {`
`107`	`107`
`108`	`108`	`lifecycle {`
`109`	`109`	`create_before_destroy = true`
	`110`	`+ ignore_changes = [`
	`111`	`+ desired_capacity`
	`112`	`+ ]`
`110`	`113`	`}`
`111`	`114`	`}`