Merge branch 'main' into ebs-volume-tags-79

Author: tobyclemson

.circleci/gpg.private.enc

@@ -3,4 +3,11 @@
 PROJECT_DIR="$(pwd)"
 
 PATH_add "${PROJECT_DIR}"
-PATH_add "${PROJECT_DIR}"/vendor/terraform/bin
+PATH_add "${PROJECT_DIR}"/vendor/**/bin
+
+if has asdf; then
+  asdf install
+fi
+
+layout ruby
+layout node

.envrc

@@ -14,6 +14,7 @@ build/
 dist/
 .bundle
 .rakeTasks
+.direnv
 
 # OS
 .DS_Store

.git-crypt/keys/default/0/41D2606F66C3FF28874362B61A16916844CE9D82.gpg

@@ -0,0 +1 @@
+ruby 3.1.1

.git-crypt/keys/default/0/6FBE564C2B75F0C9A85C335C94ABC6ADB428736E.gpg

@@ -8,6 +8,16 @@ BACKWARDS INCOMPATIBILITIES / NOTES:
   module since, in the case of autoscaling or manual scaling, the value may have
   changed between `apply`s.
 
+IMPROVEMENTS:
+
+* A `cluster_instance_metadata_options` variable has been added which mirrors
+  the [metadata_options](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/launch_template#metadata-options)
+  exposed on the `aws_launch_template` resource. Among other things, this allows
+  users of this module to require that IMDSv2 be used by containers in the 
+  cluster. By default, IMDSv2 is not required in this version of the module but
+  a future major release of the module may enforce IMDSv2 usage.
+
+
 ## 6.0.0 (February 22th 2023)
 
 BACKWARDS INCOMPATIBILITIES / NOTES:

.git-crypt/keys/default/0/7E9332CC54CC95F0A3E3E4B08D53FE70CCB99CB9.gpg

@@ -37,11 +37,11 @@ Project maintainers are responsible for clarifying the standards of acceptable
 behavior and are expected to take appropriate and fair corrective action in
 response to any instances of unacceptable behavior.
 
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
+Project maintainers have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, or to ban temporarily or permanently any
+contributor for other behaviors that they deem inappropriate, threatening,
+offensive, or harmful.
 
 ## Scope
 
@@ -72,4 +72,5 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage],
 version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
 
 [homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+
+[version]: http://contributor-covenant.org/version/1/4/