fix CI

Author: mmoutama09

.cspell.json

@@ -10,18 +10,22 @@
     "awscli",
     "boto",
     "botocore",
+    "buildx",
     "certdir",
     "checkmarx",
     "concat",
+    "containerd",
     "devskim",
     "dind",
+    "dpkg",
     "endfor",
     "filesha",
     "formatlist",
     "glrt",
     "glrunners",
     "hmarr",
     "instancelifecycle",
+    "keyrings",
     "kics",
     "joho",
     "jsonencode",
@@ -56,6 +60,7 @@
     "tmpfs",
     "tonumber",
     "trivy",
+    "usermod",
     "userns",
     "xanzy",
     "xvda"
@@ -66,6 +71,7 @@
     "autoscaler",
     "backports",
     "blockquotes",
+    "bluegreen",
     "codeowners",
     "cpu",
     "cpus",

docs/usage.md

@@ -146,7 +146,7 @@ module "runner" {
 
 ### Scenario: Use of Docker autoscaler
 
-As docker machine is no longer maintained by docker, gitlab recently developed docker_autoscaler to replace docker machine (still in beta). An option is available to test it out. It reuses the arguments int he docker-machine block arguments and create an autoscaling groupthat will be supplied to docker-autoscaler.
+As docker machine is no longer maintained by docker, gitlab recently developed docker autoscaler to replace docker machine (still in beta). An option is available to test it out.
 
 Tested with amazon-linux-2-x86 as runner manager and ubuntu-server-22-lts-x86 for runner worker. The following commands have been added to the original AMI for the runner worker for the docker-autoscaler to work correctly:
 
@@ -201,19 +201,19 @@ module "runner" {
   runner_worker_docker_autoscaler_asg = {
     on_demand_percentage_above_base_capacity = 0
     enable_mixed_instances_policy            = true
+    idle_time                                = 600
+    subnet_ids                               = vpc.private_subnets_ids
+    types                                    = ["t3a.medium", "t3.medium"]
+    volume_type                              = "gp3"
+    private_address_only                     = true
+    ebs_optimized                            = true
+    root_size                                = 40
   }
 
   runner_worker_docker_autoscaler = {
     connector_config_user = "ubuntu"
   }
 
-  runner_worker_docker_machine_instance = {
-    idle_time   = 600
-    subnet_ids  = vpc.private_subnets_ids
-    types       = ["t3a.medium", "t3.medium"]
-    volume_type = "gp3"
-  }
-
 }
 ```
 

main.tf

@@ -141,30 +141,30 @@ locals {
         for key, value in config :
         # Convert key from snake_case to PascalCase which is the casing for this section.
         join("", [for subkey in split("_", key) : title(subkey)]) => jsonencode(value) if value != null
-      }] 
-      runners_name                      = var.runner_instance.name
-      runners_token                     = var.runner_gitlab.registration_token
-      runners_executor                  = var.runner_worker.type
-      runners_limit                     = var.runner_worker.max_jobs
-      runners_concurrent                = var.runner_manager.maximum_concurrent_jobs
-      runners_environment_vars          = jsonencode(var.runner_worker.environment_variables)
-      runners_pre_build_script          = var.runner_worker_gitlab_pipeline.pre_build_script
-      runners_post_build_script         = var.runner_worker_gitlab_pipeline.post_build_script
-      runners_pre_clone_script          = var.runner_worker_gitlab_pipeline.pre_clone_script
-      runners_request_concurrency       = var.runner_worker.request_concurrency
-      runners_output_limit              = var.runner_worker.output_limit
-      runners_check_interval            = var.runner_manager.gitlab_check_interval
-      runners_volumes_tmpfs             = join("\n", [for v in var.runner_worker_docker_volumes_tmpfs : format("\"%s\" = \"%s\"", v.volume, v.options)])
-      runners_services_volumes_tmpfs    = join("\n", [for v in var.runner_worker_docker_services_volumes_tmpfs : format("\"%s\" = \"%s\"", v.volume, v.options)])
-      runners_docker_services           = local.runners_docker_services
-      runners_docker_options            = local.runners_docker_options_toml
-      bucket_name                       = local.bucket_name
-      shared_cache                      = var.runner_worker_cache.shared
-      sentry_dsn                        = var.runner_manager.sentry_dsn
-      prometheus_listen_address         = var.runner_manager.prometheus_listen_address
-      auth_type                         = var.runner_worker_cache.authentication_type
-      runners_docker_autoscaler         = var.runner_worker.type == "docker-autoscaler" ? local.template_runner_docker_autoscaler : ""
-      runners_docker_machine            = var.runner_worker.type == "docker+machine" ? local.template_runner_docker_machine : ""
+      }]
+      runners_name                   = var.runner_instance.name
+      runners_token                  = var.runner_gitlab.registration_token
+      runners_executor               = var.runner_worker.type
+      runners_limit                  = var.runner_worker.max_jobs
+      runners_concurrent             = var.runner_manager.maximum_concurrent_jobs
+      runners_environment_vars       = jsonencode(var.runner_worker.environment_variables)
+      runners_pre_build_script       = var.runner_worker_gitlab_pipeline.pre_build_script
+      runners_post_build_script      = var.runner_worker_gitlab_pipeline.post_build_script
+      runners_pre_clone_script       = var.runner_worker_gitlab_pipeline.pre_clone_script
+      runners_request_concurrency    = var.runner_worker.request_concurrency
+      runners_output_limit           = var.runner_worker.output_limit
+      runners_check_interval         = var.runner_manager.gitlab_check_interval
+      runners_volumes_tmpfs          = join("\n", [for v in var.runner_worker_docker_volumes_tmpfs : format("\"%s\" = \"%s\"", v.volume, v.options)])
+      runners_services_volumes_tmpfs = join("\n", [for v in var.runner_worker_docker_services_volumes_tmpfs : format("\"%s\" = \"%s\"", v.volume, v.options)])
+      runners_docker_services        = local.runners_docker_services
+      runners_docker_options         = local.runners_docker_options_toml
+      bucket_name                    = local.bucket_name
+      shared_cache                   = var.runner_worker_cache.shared
+      sentry_dsn                     = var.runner_manager.sentry_dsn
+      prometheus_listen_address      = var.runner_manager.prometheus_listen_address
+      auth_type                      = var.runner_worker_cache.authentication_type
+      runners_docker_autoscaler      = var.runner_worker.type == "docker-autoscaler" ? local.template_runner_docker_autoscaler : ""
+      runners_docker_machine         = var.runner_worker.type == "docker+machine" ? local.template_runner_docker_machine : ""
     }
   )
 }