-
Notifications
You must be signed in to change notification settings - Fork 75
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.
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
Add an optional health check to the container definition (#15) #84
Open
colincoleman
wants to merge
5
commits into
telia-oss:master
Choose a base branch
from
Cantara:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
22c2ab5
Add an optional health check to the container definition (#15)
colincoleman 6da0b28
Add target_group_arn_suffix to outputs for use in Cloudwatch alarms (…
colincoleman 7ba9064
Remove target group name (#17)
colincoleman bc88da4
Pull upsteam changes (#19)
colincoleman 347d978
Add tags to ECS task definition (#18)
colincoleman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -93,7 +93,6 @@ resource "aws_security_group_rule" "egress_service" { | |||||||||||
# LB Target group | ||||||||||||
# ------------------------------------------------------------------------------ | ||||||||||||
resource "aws_lb_target_group" "task" { | ||||||||||||
name = "${var.name_prefix}-${var.task_container_port}" | ||||||||||||
count = var.lb_arn == "" ? 0 : 1 | ||||||||||||
vpc_id = var.vpc_id | ||||||||||||
protocol = var.task_container_protocol | ||||||||||||
|
@@ -157,12 +156,14 @@ locals { | |||||||||||
"environment" = local.task_container_environment | ||||||||||||
"environmentFiles" = var.task_container_environment_file | ||||||||||||
"MountPoints" = local.task_container_mount_points | ||||||||||||
"ulimits" = var.task_container_ulimits | ||||||||||||
"logConfiguration" = { | ||||||||||||
"logDriver" = "awslogs" | ||||||||||||
"options" = local.log_configuration_options | ||||||||||||
} | ||||||||||||
"privileged" : var.privileged | ||||||||||||
"readonlyRootFilesystem" : var.readonlyRootFilesystem | ||||||||||||
"healthCheck" : var.container_health_check | ||||||||||||
}, local.task_container_secrets, local.repository_credentials) | ||||||||||||
Comment on lines
+166
to
167
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Following the pattern of some of the other optional variables (line 136-141), you could do something like
Suggested change
|
||||||||||||
} | ||||||||||||
|
||||||||||||
|
@@ -200,6 +201,7 @@ resource "aws_ecs_task_definition" "task" { | |||||||||||
operating_system_family = var.task_definition_os_family | ||||||||||||
cpu_architecture = var.task_definition_cpu_arch | ||||||||||||
} | ||||||||||||
tags = var.tags | ||||||||||||
} | ||||||||||||
|
||||||||||||
resource "aws_ecs_service" "service" { | ||||||||||||
|
@@ -214,7 +216,7 @@ resource "aws_ecs_service" "service" { | |||||||||||
cluster = var.cluster_id | ||||||||||||
task_definition = var.task_definition != "" ? var.task_definition : aws_ecs_task_definition.task.arn | ||||||||||||
desired_count = var.desired_count | ||||||||||||
launch_type = "FARGATE" | ||||||||||||
launch_type = length(var.capacity_provider_strategy) == 0 ? "FARGATE" : null | ||||||||||||
deployment_minimum_healthy_percent = var.deployment_minimum_healthy_percent | ||||||||||||
deployment_maximum_percent = var.deployment_maximum_percent | ||||||||||||
health_check_grace_period_seconds = var.lb_arn == "" ? null : var.health_check_grace_period_seconds | ||||||||||||
|
@@ -262,6 +264,15 @@ resource "aws_ecs_service" "service" { | |||||||||||
container_name = var.container_name != "" ? var.container_name : var.name_prefix | ||||||||||||
} | ||||||||||||
} | ||||||||||||
tags = var.tags | ||||||||||||
dynamic "capacity_provider_strategy" { | ||||||||||||
for_each = var.capacity_provider_strategy | ||||||||||||
content { | ||||||||||||
base = lookup(capacity_provider_strategy.value, "base", null) | ||||||||||||
capacity_provider = lookup(capacity_provider_strategy.value, "capacity_provider", null) | ||||||||||||
weight = lookup(capacity_provider_strategy.value, "weight", null) | ||||||||||||
} | ||||||||||||
} | ||||||||||||
} | ||||||||||||
|
||||||||||||
# HACK: The workaround used in ecs/service does not work for some reason in this module, this fixes the following error: | ||||||||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||
---|---|---|---|---|---|---|---|---|
|
@@ -306,6 +306,12 @@ variable "volumes" { | |||||||
default = [] | ||||||||
} | ||||||||
|
||||||||
variable "capacity_provider_strategy" { | ||||||||
description = "List capacity provider strategy" | ||||||||
type = list(any) | ||||||||
default = [] | ||||||||
} | ||||||||
|
||||||||
variable "extra_target_groups" { | ||||||||
description = "List of extra target group configurations used to register a service to multiple target groups" | ||||||||
type = list(object({ | ||||||||
|
@@ -314,3 +320,27 @@ variable "extra_target_groups" { | |||||||
})) | ||||||||
default = [] | ||||||||
} | ||||||||
|
||||||||
variable "container_health_check" { | ||||||||
description = "An ECS TaskDefinition HealthCheck object to set in each container" | ||||||||
default = null | ||||||||
type = object( | ||||||||
{ | ||||||||
command = list(string) | ||||||||
interval = number | ||||||||
retries = number | ||||||||
startPeriod = number | ||||||||
timeout = number | ||||||||
} | ||||||||
) | ||||||||
} | ||||||||
|
||||||||
variable "task_container_ulimits" { | ||||||||
type = list(object({ | ||||||||
name = string | ||||||||
hardLimit = number | ||||||||
softLimit = number | ||||||||
})) | ||||||||
description = "(Optional) Container ulimit settings. This is a list of maps, where each map should contain \"name\", \"hardLimit\" and \"softLimit\"" | ||||||||
default = null | ||||||||
} | ||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,7 +7,7 @@ terraform { | |
} | ||
null = { | ||
source = "hashicorp/null" | ||
version = "~> 3.1.0" | ||
version = ">= 3.1.0" | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removing name forces new resource.