Skip to content

Commit

Permalink
FARGATE compatible
Browse files Browse the repository at this point in the history
  • Loading branch information
@SaiPrasannaGopularam
SaiPrasannaGopularam committed Apr 13, 2023
1 parent 0ec4de2 commit 622e527
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 29 deletions.
22 changes: 11 additions & 11 deletions alb.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ resource "aws_alb_listener" "service_http" {
}

resource "aws_alb_target_group" "service" {
name = "${var.service_identifier}-${var.task_identifier}"
port = var.app_port
protocol = "HTTP"
name = "${var.service_identifier}-${var.task_identifier}"
port = var.app_port
protocol = "HTTP"
deregistration_delay = var.alb_deregistration_delay
vpc_id = data.aws_vpc.vpc.id
vpc_id = data.aws_vpc.vpc.id

health_check {
interval = var.alb_healthcheck_interval
Expand Down Expand Up @@ -109,11 +109,11 @@ resource "aws_security_group_rule" "alb_ingress_http" {
}

resource "aws_security_group_rule" "alb_egress" {
count = var.alb_enable_https || var.alb_enable_http ? 1 : 0
type = "egress"
from_port = 0
to_port = 65535
protocol = "-1"
cidr_blocks = var.alb_sg_cidr_egress
security_group_id = aws_security_group.alb[0].id
count = var.alb_enable_https || var.alb_enable_http ? 1 : 0
type = "egress"
from_port = 0
to_port = 65535
protocol = "-1"
cidr_blocks = var.alb_sg_cidr_egress
security_group_id = aws_security_group.alb[0].id
}
14 changes: 9 additions & 5 deletions ecs.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,14 @@ data "template_file" "container_definition" {
}

resource "aws_ecs_task_definition" "task" {
family = "${var.service_identifier}-${var.task_identifier}"
container_definitions = data.template_file.container_definition.rendered
network_mode = var.network_mode
task_role_arn = aws_iam_role.task.arn
family = "${var.service_identifier}-${var.task_identifier}"
container_definitions = data.template_file.container_definition.rendered
network_mode = var.network_mode
requires_compatibilities = var.req_compatibilities
cpu = var.cpu
memory = var.memory
execution_role_arn = aws_iam_role.task_execution_role.arn
task_role_arn = aws_iam_role.task.arn

volume {
name = "data"
Expand All @@ -46,7 +50,7 @@ resource "aws_ecs_service" "service" {
health_check_grace_period_seconds = var.ecs_health_check_grace_period

deployment_controller {
type = var.deployment_controller_type
type = var.deployment_controller_type
}

ordered_placement_strategy {
Expand Down
2 changes: 1 addition & 1 deletion files/container_definition.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"portMappings": [
{
"containerPort": ${app_port},
"hostPort": 0,
"hostPort": ${host_port},
"protocol": "tcp"
}
],
Expand Down
21 changes: 16 additions & 5 deletions iam.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,21 @@ data "aws_iam_policy_document" "assume_role_service" {
}

resource "aws_iam_role" "task" {
name_prefix = "${var.service_identifier}-${var.task_identifier}-ecsTaskRole"
name_prefix = "${var.service_identifier}-${var.task_identifier}-ecsTaskRole"
path = "/${var.service_identifier}/"
assume_role_policy = data.aws_iam_policy_document.assume_role_task.json

tags = var.tags
}

resource "aws_iam_role_policy" "task" {
name_prefix = "${var.service_identifier}-${var.task_identifier}-ecsTaskPolicy"
role = aws_iam_role.task.name
policy = data.aws_iam_policy_document.task_policy.json
name_prefix = "${var.service_identifier}-${var.task_identifier}-ecsTaskPolicy"
role = aws_iam_role.task.name
policy = data.aws_iam_policy_document.task_policy.json
}

resource "aws_iam_role" "service" {
name_prefix = "${var.service_identifier}-${var.task_identifier}-ecsServiceRole"
name_prefix = "${var.service_identifier}-${var.task_identifier}-ecsServiceRole"
path = "/${var.service_identifier}/"
assume_role_policy = data.aws_iam_policy_document.assume_role_service.json

Expand All @@ -79,3 +79,14 @@ resource "aws_iam_role_policy_attachment" "task_extra" {
role = aws_iam_role.task.name
policy_arn = var.extra_task_policy_arns[count.index]
}

resource "aws_iam_role" "task_execution_role" {
name = "${var.service_identifier}-${var.task_identifier}-ecsTaskExecutionRole"
assume_role_policy = data.aws_iam_policy_document.assume_role_task.json
tags = var.tags
}

resource "aws_iam_role_policy_attachment" "task-execution-role-policy-attachment" {
role = aws_iam_role.task_execution_role.name
policy_arn = "arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy"
}
34 changes: 27 additions & 7 deletions variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ variable "ecs_deployment_minimum_healthy_percent" {

variable "deployment_controller_type" {
description = "Type of deployment controller. Valid values: CODE_DEPLOY, ECS. Default: ECS."
default = "ECS"
default = "ECS"
}

variable "ecs_health_check_grace_period" {
Expand Down Expand Up @@ -90,6 +90,21 @@ variable "network_mode" {
default = "bridge"
}

variable "req_compatibilities" {
description = "Launch type required by the task. Either EC2 or FARGATE"
default = "[EC2]"
}

variable "cpu" {
description = "Number of cpu units used by the task. Required for FARGATE type"
default = null
}

variable "memory" {
description = "Amount (in MiB) of memory used by the task. Required for FARGATE type"
default = null
}

variable "service_identifier" {
description = "Unique identifier for this pganalyze service (used in log prefix, service name etc.)"
default = "service"
Expand All @@ -103,7 +118,7 @@ variable "task_identifier" {
variable "log_group_name" {
type = string
description = "Name for CloudWatch Log Group that will receive collector logs (must be unique, default is created from service_identifier and task_identifier)"
default = ""
default = null
}

variable "extra_task_policy_arns" {
Expand All @@ -115,7 +130,7 @@ variable "extra_task_policy_arns" {
variable "acm_cert_domain" {
type = string
description = "Domain name of ACM-managed certificate"
default = ""
default = null
}

variable "alb_enable_https" {
Expand Down Expand Up @@ -153,6 +168,11 @@ variable "app_port" {
description = "Numeric port on which application listens (unnecessary if neither alb_enable_https or alb_enable_http are true)"
}

variable "host_port" {
description = "Numeric port on which you want to map it to on the host"
default = 0
}

variable "ecs_placement_strategy_type" {
description = "Placement strategy to use when distributing tasks (default spread)"
default = "spread"
Expand All @@ -178,7 +198,7 @@ variable "lb_bucket_name" {
}

variable "lb_prefix_override" {
default = ""
default = null
}

variable "lb_log_prefix" {
Expand Down Expand Up @@ -237,11 +257,11 @@ variable "alb_cookie_duration" {
}

variable "alb_deregistration_delay" {
description = "The amount of time in seconds to wait before deregistering a target from a target group."
default = "300"
description = "The amount of time in seconds to wait before deregistering a target from a target group."
default = "300"
}

variable "tags" {
description = "Map of tags for everything but an ALB."
default = {}
default = {}
}

0 comments on commit 622e527

Please sign in to comment.