diff --git a/modules/jenkins_platform/ecs.tf b/modules/jenkins_platform/ecs.tf index fe36701..2591ae8 100644 --- a/modules/jenkins_platform/ecs.tf +++ b/modules/jenkins_platform/ecs.tf @@ -1,7 +1,6 @@ // Jenkins Container Infra (Fargate) resource "aws_ecs_cluster" jenkins_controller { name = "${var.name_prefix}-main" - capacity_providers = ["FARGATE"] tags = var.tags setting { name = "containerInsights" @@ -9,9 +8,17 @@ resource "aws_ecs_cluster" jenkins_controller { } } +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" @@ -19,6 +26,15 @@ resource "aws_ecs_cluster" jenkins_agents { } } +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") @@ -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 @@ -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