Merge pull request #27 from cruxstack/dev

feat: change interface for configuring spot or ondemand

Author: sgtoj

main.tf

@@ -2,8 +2,8 @@ locals {
   enabled = coalesce(var.enabled, module.this.enabled, true)
   name    = coalesce(var.name, module.this.name, "teleport-cluster-${random_string.teleport_cluster_random_suffix.result}")
 
-  aws_account_id   = var.aws_account_id != "" ? var.aws_account_id : try(data.aws_caller_identity.current[0].account_id, "")
-  aws_region_name  = var.aws_region_name != "" ? var.aws_region_name : try(data.aws_region.current[0].name, "")
+  aws_account_id   = var.aws_account_id != "" ? var.aws_account_id : one(data.aws_caller_identity.current.*.account_id)
+  aws_region_name  = var.aws_region_name != "" ? var.aws_region_name : one(data.aws_region.current.*.region)
   aws_kv_namespace = trim(coalesce(var.aws_kv_namespace, "teleport-cluster/${module.teleport_cluster_label.id}"), "/")
 
   teleport_cluster_name          = join("-", [module.teleport_cluster_label.name, module.teleport_cluster_label.stage, module.teleport_cluster_label.environment])
@@ -55,9 +55,9 @@ resource "random_string" "teleport_cluster_random_suffix" {
 module "auth_servers" {
   source = "./modules/teleport-node"
 
-  instance_sizes        = local.instance_config.auth.sizes
-  instance_count        = local.instance_config.auth.count
-  instance_spot_enabled = local.instance_config.auth.spot
+  instance_sizes = local.instance_config.auth.sizes
+  instance_count = local.instance_config.auth.count
+  instance_spot  = local.instance_config.auth.spot
 
   teleport_cluster_name      = local.teleport_cluster_name
   teleport_image_id          = local.teleport_image_id
@@ -91,9 +91,9 @@ module "auth_servers" {
 module "proxy_servers" {
   source = "./modules/teleport-node"
 
-  instance_sizes        = local.instance_config.proxy.sizes
-  instance_count        = local.instance_config.proxy.count
-  instance_spot_enabled = local.instance_config.proxy.spot
+  instance_sizes = local.instance_config.proxy.sizes
+  instance_count = local.instance_config.proxy.count
+  instance_spot  = local.instance_config.proxy.spot
 
   teleport_cluster_name      = local.teleport_cluster_name
   teleport_image_id          = local.teleport_image_id
@@ -128,9 +128,9 @@ module "proxy_servers" {
 module "node_servers" {
   source = "./modules/teleport-node"
 
-  instance_sizes        = local.instance_config.node.sizes
-  instance_count        = local.instance_config.node.count
-  instance_spot_enabled = local.instance_config.node.spot
+  instance_sizes = local.instance_config.node.sizes
+  instance_count = local.instance_config.node.count
+  instance_spot  = local.instance_config.node.spot
 
   teleport_cluster_name      = local.teleport_cluster_name
   teleport_image_id          = local.teleport_image_id

modules/teleport-node/main.tf

@@ -19,11 +19,11 @@ locals {
   logs_bucket_name      = var.logs_bucket_name
   experimental          = var.experimental
 
-  desired_capacity      = local.teleport_setup_enabled ? (local.teleport_node_type == "auth" ? 1 : 0) : var.instance_count
-  min_capacity          = local.teleport_setup_enabled ? (local.teleport_node_type == "auth" ? 1 : 0) : var.instance_count
-  max_capacity          = local.teleport_setup_enabled ? (local.teleport_node_type == "auth" ? 1 : 0) : var.instance_count
-  instance_sizes        = var.instance_sizes
-  instance_spot_enabled = var.instance_spot_enabled
+  desired_capacity = local.teleport_setup_enabled ? (local.teleport_node_type == "auth" ? 1 : 0) : var.instance_count
+  min_capacity     = local.teleport_setup_enabled ? (local.teleport_node_type == "auth" ? 1 : 0) : var.instance_count
+  max_capacity     = local.teleport_setup_enabled ? (local.teleport_node_type == "auth" ? 1 : 0) : var.instance_count
+  instance_sizes   = var.instance_sizes
+  instance_spot    = var.instance_spot
 
   dns_name           = "${module.dns_label.id}.${var.dns_parent_zone_name}"
   dns_parent_zone_id = var.dns_parent_zone_id
@@ -339,8 +339,8 @@ resource "aws_autoscaling_group" "this" {
   mixed_instances_policy {
     instances_distribution {
       on_demand_base_capacity                  = 0
-      on_demand_percentage_above_base_capacity = local.instance_spot_enabled ? 0 : 100
-      spot_allocation_strategy                 = "capacity-optimized"
+      on_demand_percentage_above_base_capacity = local.instance_spot.enabled ? 0 : 100
+      spot_allocation_strategy                 = local.instance_spot.allocation_strategy
       spot_instance_pools                      = 0
     }
 

modules/teleport-node/variables.tf

@@ -62,9 +62,12 @@ variable "instance_sizes" {
   default = ["t3.medium", "t3a.medium"]
 }
 
-variable "instance_spot_enabled" {
-  type    = bool
-  default = true
+variable "instance_spot" {
+  type = object({
+    enabled             = optional(bool, true)
+    allocation_strategy = optional(string, "capacity-optimized")
+  })
+  default = {}
 }
 
 # ----------------------------------------------------------- infrastructure ---

variables.tf

@@ -29,20 +29,29 @@ variable "instance_config" {
     auth = optional(object({
       count         = optional(number, 1)
       sizes         = optional(list(string), ["t3.micro", "t3a.micro"])
-      spot          = optional(bool, true)
       allowed_cidrs = optional(list(string), ["0.0.0.0/0"])
+      spot = optional(object({
+        enabled             = optional(bool, true)
+        allocation_strategy = optional(string, "capacity-optimized")
+      }), {})
     }), {})
     node = optional(object({
       count         = optional(number, 1)
       sizes         = optional(list(string), ["t3.micro", "t3a.micro"])
-      spot          = optional(bool, true)
       allowed_cidrs = optional(list(string), ["0.0.0.0/0"])
+      spot = optional(object({
+        enabled             = optional(bool, true)
+        allocation_strategy = optional(string, "capacity-optimized")
+      }), {})
     }), {})
     proxy = optional(object({
       count         = optional(number, 1)
       sizes         = optional(list(string), ["t3.micro", "t3a.micro"])
-      spot          = optional(bool, true)
       allowed_cidrs = optional(list(string), ["0.0.0.0/0"])
+      spot = optional(object({
+        enabled             = optional(bool, true)
+        allocation_strategy = optional(string, "capacity-optimized")
+      }), {})
     }), {})
   })
   description = "Configuration for the instances. Each type (`auth`, `node`, `proxy`) contains an object with `count`, `sizes`, and `allowed_cidrs`."

version.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 5.0.0, < 6.0.0"
+      version = ">= 6.0.0"
     }
     random = {
       source  = "hashicorp/random"