[WIP] fix fleeting plugin installation for docker autoscaler

docker_autoscaler.tf

@@ -164,7 +164,7 @@ resource "aws_autoscaling_group" "autoscaler" {
     for_each = local.tags
     content {
       key                 = tag.key
-      value               = tag.value
+      value               = tag.key == "Name" ? "${tag.value}-runner-worker" : tag.value
       propagate_at_launch = true
     }
   }

main.tf

@@ -90,6 +90,7 @@ locals {
       docker_autoscaling_name       = var.runner_worker.type == "docker-autoscaler" ? aws_autoscaling_group.autoscaler[0].name : ""
       connector_config_user         = var.runner_worker_docker_autoscaler.connector_config_user
       runners_capacity_per_instance = var.runner_worker_docker_autoscaler.capacity_per_instance
+      delete_instances_on_shutdown  = var.runner_worker_docker_autoscaler.delete_instances_on_shutdown
       runners_max_use_count         = var.runner_worker_docker_autoscaler.max_use_count
       runners_max_instances         = var.runner_worker.max_jobs
 
@@ -165,7 +166,7 @@ resource "aws_autoscaling_group" "gitlab_runner_instance" {
 
     content {
       key                 = tag.key
-      value               = tag.value
+      value               = tag.key == "Name" ? "${tag.value}-manager" : tag.value
       propagate_at_launch = true
     }
   }

template/gitlab-runner.tftpl

@@ -204,24 +204,25 @@ if [[ "${runners_executor}" == "docker-autoscaler" ]]; then
   usermod -a -G docker ec2-user
   service docker start
 
-  echo "Installing Docker fleeting plugin"
-  # Determine architecture
-  if [[ "$(uname -m)" == "x86_64" ]]; then
-    ARCH="amd64"
-  elif [[ "$(uname -m)" == "i686" ]]; then
-    ARCH="386"
-  elif [[ "$(uname -m)" == "armv7l" ]]; then
-    ARCH="arm"
-  elif [[ "$(uname -m)" == "aarch64" ]]; then
-    ARCH="arm64"
-  else
-    echo "Unsupported architecture"
-    exit 1
-  fi
-
-  wget "https://gitlab.com/gitlab-org/fleeting/plugins/aws/-/releases/v${fleeting_plugin_version}/downloads/fleeting-plugin-aws-$(uname -s | tr '[:upper:]' '[:lower:]')-$ARCH"
-  chmod +x fleeting-plugin-aws-*
-  mv fleeting-plugin-aws-* /bin/fleeting-plugin-aws
+  # TODO make it variable by external variable or by gitlab_runner_version variable
+  #  echo "Installing Docker fleeting plugin"
+  #  # Determine architecture
+  #  if [[ "$(uname -m)" == "x86_64" ]]; then
+  #    ARCH="amd64"
+  #  elif [[ "$(uname -m)" == "i686" ]]; then
+  #    ARCH="386"
+  #  elif [[ "$(uname -m)" == "armv7l" ]]; then
+  #    ARCH="arm"
+  #  elif [[ "$(uname -m)" == "aarch64" ]]; then
+  #    ARCH="arm64"
+  #  else
+  #    echo "Unsupported architecture"
+  #    exit 1
+  #  fi
+  #
+  #  wget "https://gitlab.com/gitlab-org/fleeting/plugins/aws/-/releases/v${fleeting_plugin_version}/downloads/fleeting-plugin-aws-$(uname -s | tr '[:upper:]' '[:lower:]')-$ARCH"
+  #  chmod +x fleeting-plugin-aws-*
+  #  mv fleeting-plugin-aws-* /bin/fleeting-plugin-aws
 
   mkdir ~/.aws
   cat <<EOF > ~/.aws/config
@@ -297,6 +298,11 @@ if ! ( rpm -q gitlab-runner >/dev/null )
 then
   curl --fail --retry 6 -L https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.rpm.sh | bash
   yum install gitlab-runner-${gitlab_runner_version} -y
+
+  # TODO make it variable by external variable or by gitlab_runner_version variable
+  if [[ "${runners_executor}" == "docker-autoscaler" ]]; then
+    gitlab-runner fleeting install
+  fi
 fi
 
 #############################

template/runner-docker-autoscaler-config.tftpl

@@ -1,11 +1,14 @@
 # Autoscaler config
   [runners.autoscaler]
-    plugin = "fleeting-plugin-aws"
+   # TODO make it variable by external variable or by gitlab_runner_version variable
+    plugin = "aws:latest"
 
     capacity_per_instance = ${runners_capacity_per_instance}
     update_interval = "${runners_update_interval}"
     update_interval_when_expecting = "${runners_update_interval_when_expecting}"
 
+    delete_instances_on_shutdown = ${delete_instances_on_shutdown}
+
     max_use_count = ${runners_max_use_count}
     max_instances = ${runners_max_instances}
 

variables.tf

@@ -744,6 +744,7 @@ variable "runner_worker_docker_autoscaler" {
     max_use_count = Max job number that can run on a worker.
     update_interval = The interval to check with the fleeting plugin for instance updates.
     update_interval_when_expecting = The interval to check with the fleeting plugin for instance updates when expecting a state change.
+    delete_instances_on_shutdown = delete runner worker instance on shuting down gitlab-runner manager (default true).
     instance_ready_command = Executes this command on each instance provisioned by the autoscaler to ensure that it is ready for use. A failure results in the instance being removed.
   EOT
   type = object({
@@ -754,6 +755,7 @@ variable "runner_worker_docker_autoscaler" {
     max_use_count                  = optional(number, 100)
     update_interval                = optional(string, "1m")
     update_interval_when_expecting = optional(string, "2s")
+    delete_instances_on_shutdown   = optional(bool, true)
     instance_ready_command         = optional(string, "")
   })
   default = {}