Skip to content

fix: autoscaler asg subnets and add possibility to enable metrics for asg #1182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 5, 2024
+4 −1
Merged

fix: autoscaler asg subnets and add possibility to enable metrics for asg #1182

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93385e5
add enable_metrics option to autoscaler asg
mmoutama09 Aug 28, 2024
43f0c94
add multiple subnet for runner manager for type autoscaler
mmoutama09 Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docker_autoscaler.tf
View file
Original file line number Diff line number Diff line change
@@ -177,6 +177,7 @@ resource "aws_autoscaling_group" "autoscaler" {
health_check_grace_period = var.runner_worker_docker_autoscaler_asg.health_check_grace_period
health_check_type = var.runner_worker_docker_autoscaler_asg.health_check_type
force_delete = true
enabled_metrics = var.runner_worker_docker_autoscaler_asg.enabled_metrics

dynamic "tag" {
for_each = local.tags
2 changes: 1 addition & 1 deletion main.tf
View file
Original file line number Diff line number Diff line change
@@ -183,7 +183,7 @@ locals {
resource "aws_autoscaling_group" "gitlab_runner_instance" {
# TODO Please explain how `agent_enable_asg_recreation` works
name = var.runner_enable_asg_recreation ? "${aws_launch_template.gitlab_runner_instance.name}-asg" : "${var.environment}-as-group"
vpc_zone_identifier = length(var.runner_worker_docker_machine_instance.subnet_ids) > 0 ? var.runner_worker_docker_machine_instance.subnet_ids : [var.subnet_id]
vpc_zone_identifier = length(var.runner_worker_docker_machine_instance.subnet_ids) > 0 ? var.runner_worker_docker_machine_instance.subnet_ids : length(var.runner_worker_docker_autoscaler_asg.subnet_ids) > 0 ? var.runner_worker_docker_autoscaler_asg.subnet_ids : [var.subnet_id]
min_size = "1"
max_size = "1"
desired_capacity = "1"
2 changes: 2 additions & 0 deletions variables.tf
View file
Original file line number Diff line number Diff line change
@@ -670,6 +670,7 @@ variable "runner_worker_docker_autoscaler_asg" {
subnet_ids = The list of subnet IDs to use for the Runner Worker when the fleet mode is enabled.
types = The type of instance to use for the Runner Worker. In case of fleet mode, multiple instance types are supported.
upgrade_strategy = Auto deploy new instances when launch template changes. Can be either 'bluegreen', 'rolling' or 'off'
enabled_metrics = List of metrics to collect.
EOT
type = object({
enable_mixed_instances_policy = optional(bool, false)
@@ -686,6 +687,7 @@ variable "runner_worker_docker_autoscaler_asg" {
subnet_ids = optional(list(string), [])
types = optional(list(string), ["m5.large"])
upgrade_strategy = optional(string, "rolling")
enabled_metrics = optional(list(string), [])
sg_ingresses = optional(list(object({
description = string
from_port = number