Skip to content

Fix capacity_providers #41

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix capacity_providers #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 22 additions & 6 deletions modules/jenkins_platform/ecs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,40 @@
// Jenkins Container Infra (Fargate)
resource "aws_ecs_cluster" jenkins_controller {
name = "${var.name_prefix}-main"
capacity_providers = ["FARGATE"]
tags = var.tags
setting {
name = "containerInsights"
value = "enabled"
}
}

resource "aws_ecs_cluster_capacity_providers" jenkins_controller {
cluster_name = "${var.name_prefix}-main"
capacity_providers = ["FARGATE"]
default_capacity_provider_strategy {
capacity_provider = "FARGATE"
weight = 1
}
}

resource "aws_ecs_cluster" jenkins_agents {
name = "${var.name_prefix}-spot"
capacity_providers = ["FARGATE_SPOT"]
tags = var.tags
setting {
name = "containerInsights"
value = "enabled"
}
}

resource "aws_ecs_cluster_capacity_providers" jenkins_agents {
cluster_name = "${var.name_prefix}-spot"
capacity_providers = ["FARGATE_SPOT"]
default_capacity_provider_strategy {
capacity_provider = "FARGATE_SPOT"
weight = 1
}
}

data "template_file" jenkins_controller_container_def {
template = file("${path.module}/templates/jenkins-controller.json.tpl")

Expand All @@ -30,7 +46,7 @@ data "template_file" jenkins_controller_container_def {
jenkins_home = "/var/jenkins_home"
container_image = aws_ecr_repository.jenkins_controller.repository_url
region = local.region
account_id = local.account_id
account_id = local.account_id
log_group = aws_cloudwatch_log_group.jenkins_controller_log_group.name
memory = var.jenkins_controller_memory
cpu = var.jenkins_controller_cpu
Expand Down Expand Up @@ -90,11 +106,11 @@ resource "aws_ecs_service" jenkins_controller {
launch_type = "FARGATE"
platform_version = "1.4.0"

// Assuming we cannot have more than one instance at a time. Ever.
// Assuming we cannot have more than one instance at a time. Ever.
deployment_maximum_percent = 100
deployment_minimum_healthy_percent = 0


service_registries {
registry_arn = aws_service_discovery_service.controller.arn
port = var.jenkins_jnlp_port
Expand Down