Merge pull request #26 from cruxstack/dev

feat: support on-demand instances

Author: sgtoj

main.tf

@@ -55,8 +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_sizes        = local.instance_config.auth.sizes
+  instance_count        = local.instance_config.auth.count
+  instance_spot_enabled = local.instance_config.auth.spot
 
   teleport_cluster_name      = local.teleport_cluster_name
   teleport_image_id          = local.teleport_image_id
@@ -90,8 +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_sizes        = local.instance_config.proxy.sizes
+  instance_count        = local.instance_config.proxy.count
+  instance_spot_enabled = local.instance_config.proxy.spot
 
   teleport_cluster_name      = local.teleport_cluster_name
   teleport_image_id          = local.teleport_image_id
@@ -126,8 +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_sizes        = local.instance_config.node.sizes
+  instance_count        = local.instance_config.node.count
+  instance_spot_enabled = 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,10 +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
+  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
 
   dns_name           = "${module.dns_label.id}.${var.dns_parent_zone_name}"
   dns_parent_zone_id = var.dns_parent_zone_id
@@ -338,7 +339,7 @@ resource "aws_autoscaling_group" "this" {
   mixed_instances_policy {
     instances_distribution {
       on_demand_base_capacity                  = 0
-      on_demand_percentage_above_base_capacity = 0
+      on_demand_percentage_above_base_capacity = local.instance_spot_enabled ? 0 : 100
       spot_allocation_strategy                 = "capacity-optimized"
       spot_instance_pools                      = 0
     }

modules/teleport-node/variables.tf

@@ -52,7 +52,6 @@ variable "experimental" {
 
 # ----------------------------------------------------------------- instance ---
 
-
 variable "instance_count" {
   type    = number
   default = 1
@@ -63,6 +62,11 @@ variable "instance_sizes" {
   default = ["t3.medium", "t3a.medium"]
 }
 
+variable "instance_spot_enabled" {
+  type    = bool
+  default = true
+}
+
 # ----------------------------------------------------------- infrastructure ---
 
 variable "artifacts_bucket_name" {

variables.tf

@@ -29,16 +29,19 @@ 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"])
     }), {})
     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"])
     }), {})
     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"])
     }), {})
   })