Support the allowed_instance_types option for terraform (LeanerCloud#192

)
TAIPANBOX · Feb 10, 2018 · 20fced1 · 20fced1
1 parent 659f81d
commit 20fced1
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 0 deletions.
diff --git a/terraform/autospotting.tf b/terraform/autospotting.tf
@@ -1,6 +1,7 @@
 module "autospotting" {
   source = "./autospotting"
 
+  autospotting_allowed_instance_types       = "${var.asg_allowed_instance_types}"
   autospotting_disallowed_instance_types    = "${var.asg_disallowed_instance_types}"
   autospotting_min_on_demand_number         = "${var.asg_min_on_demand_number}"
   autospotting_min_on_demand_percentage     = "${var.asg_min_on_demand_percentage}"

diff --git a/terraform/autospotting/lambda.tf b/terraform/autospotting/lambda.tf
@@ -10,6 +10,7 @@ resource "aws_lambda_function" "autospotting" {
 
   environment {
     variables = {
+      ALLOWED_INSTANCE_TYPES       = "${var.autospotting_allowed_instance_types}"
       DISALLOWED_INSTANCE_TYPES    = "${var.autospotting_disallowed_instance_types}"
       MIN_ON_DEMAND_NUMBER         = "${var.autospotting_min_on_demand_number}"
       MIN_ON_DEMAND_PERCENTAGE     = "${var.autospotting_min_on_demand_percentage}"

diff --git a/terraform/autospotting/variables.tf b/terraform/autospotting/variables.tf
@@ -1,4 +1,17 @@
 # Autospotting configuration
+variable "autospotting_allowed_instance_types" {
+  description = <<EOF
+Comma separated list of allowed instance types for spot requests,
+in case you want to exclude specific types (also support globs).
+
+Example: 't2.*,m4.large'
+
+Using the 'current' magic value will only allow the same type as the
+on-demand instances set in the group's launch configuration.
+EOF
+  default = ""
+}
+
 variable "autospotting_disallowed_instance_types" {
   description = <<EOF
 Comma separated list of disallowed instance types for spot requests,

diff --git a/terraform/variables.tf b/terraform/variables.tf
@@ -1,4 +1,14 @@
 # Autospotting configuration
+variable "asg_allowed_instance_types" {
+  description = <<EOF
+If specified, the spot instances will have a specific instance type:
+
+current: the same as initial on-demand instances
+<instance-type>: the actual instance type to use
+EOF
+  default     = ""
+}
+
 variable "asg_disallowed_instance_types" {
   description = <<EOF
 Comma separated list of disallowed instance types for spot requests,