fix: Volume size is ingored

The problen is most likely introduces in one of the PR's to support multiple ebs.

The following options for volumes are now supported.
- Default, create an ebs for amazon linux
- Provide explicit ebs mappings via block_device_mappings
- No ebs, set block_device_mappings to []
- Decrecated! Overwrite the default volume size by setting volume_size

close: #1954

examples/default/main.tf

@@ -29,13 +29,15 @@ module "runners" {
     id             = var.github_app_id
     webhook_secret = random_id.random.hex
   }
+
+  block_device_mappings = []
 
   # Grab zip files via lambda_download
-  webhook_lambda_zip                = "lambdas-download/webhook.zip"
-  runner_binaries_syncer_lambda_zip = "lambdas-download/runner-binaries-syncer.zip"
-  runners_lambda_zip                = "lambdas-download/runners.zip"
+  # webhook_lambda_zip                = "lambdas-download/webhook.zip"
+  # runner_binaries_syncer_lambda_zip = "lambdas-download/runner-binaries-syncer.zip"
+  # runners_lambda_zip                = "lambdas-download/runners.zip"
 
-  enable_organization_runners = false
+  enable_organization_runners = true
   runner_extra_labels         = "default,example"
 
   # enable access to the runners via SSM

modules/runners/main.tf

@@ -64,7 +64,7 @@ resource "aws_launch_template" "runner" {
       ebs {
         delete_on_termination = lookup(block_device_mappings.value, "delete_on_termination", true)
         volume_type           = lookup(block_device_mappings.value, "volume_type", "gp3")
-        volume_size           = lookup(block_device_mappings.value, "volume_size", var.volume_size)
+        volume_size           = var.volume_size == null ? lookup(block_device_mappings.value, "volume_size", "30"): var.volume_size
         encrypted             = lookup(block_device_mappings.value, "encrypted", true)
         iops                  = lookup(block_device_mappings.value, "iops", null)
       }

modules/runners/variables.tf

@@ -55,7 +55,14 @@ variable "block_device_mappings" {
     encrypted             = bool
     iops                  = number
   }))
-  default = []
+  default = [{
+    device_name           = "/dev/xvd"
+    delete_on_termination = true
+    volume_type           = "gp3"
+    volume_size           = 30
+    encrypted             = true
+    iops                  = null
+  }]
 }
 
 variable "market_options" {
@@ -397,9 +404,9 @@ variable "runner_additional_security_group_ids" {
 }
 
 variable "volume_size" {
-  description = "Size of runner volume"
+  description = "(Deprecaated, use block_device_mappings. Size of runner volume, if set it overrides the value provide via block_device_mappings."
   type        = number
-  default     = 30
+  default     = null
 }
 
 variable "kms_key_arn" {

variables.tf

@@ -233,7 +233,14 @@ variable "block_device_mappings" {
     encrypted             = bool
     iops                  = number
   }))
-  default = []
+  default = [{
+    device_name           = "/dev/xvd"
+    delete_on_termination = true
+    volume_type           = "gp3"
+    volume_size           = 30
+    encrypted             = true
+    iops                  = null
+  }]
 }
 
 variable "ami_filter" {
@@ -390,9 +397,9 @@ variable "instance_max_spot_price" {
 }
 
 variable "volume_size" {
-  description = "Size of runner volume"
+  description = "(Deprecaated, use block_device_mappings. Size of runner volume, if set it overrides the value provide via block_device_mappings."
   type        = number
-  default     = 30
+  default     = null
 }
 
 variable "instance_type" {