Skip to content
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

1.20.0 #39

Merged
merged 3 commits into from
Sep 9, 2024
Merged

1.20.0 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16167e5
ECS: Remove H2O and Grok Compute
dnillovna Jul 27, 2024
5691504
GitHub Actions: Refactor: Automated formatting of terraform code (#38)
github-actions[bot] Jul 27, 2024
e2bb518
ECS: JKG: Remove S3 access
dnillovna Jul 27, 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
101 changes: 16 additions & 85 deletions aws/common.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ locals {
create_kms = var.custom_kms_key && !try(length(var.kms_key) > 0, false)

images = {
grok_compute = {
image = var.docker_grok_compute_image
tag = var.docker_grok_compute_tag == "latest" ? "${var.docker_grok_compute_tag}-${formatdate("YYYYMMDDhhmmss", timestamp())}" : var.docker_grok_compute_tag
},
jupyter_kernel_gateway = {
image = var.docker_jkg_image
tag = var.docker_jkg_tag == "latest" ? "${var.docker_jkg_tag}-${formatdate("YYYYMMDDhhmmss", timestamp())}" : var.docker_jkg_tag
Expand All @@ -27,109 +23,44 @@ locals {
image = var.docker_jn_image
tag = var.docker_jn_tag == "latest" ? "${var.docker_jn_tag}-${formatdate("YYYYMMDDhhmmss", timestamp())}" : var.docker_jn_tag
},
h2o = {
image = var.docker_h2o_image
tag = var.docker_h2o_tag == "latest" ? "${var.docker_h2o_tag}-${formatdate("YYYYMMDDhhmmss", timestamp())}" : var.docker_h2o_tag
},
"ecs-searchdomain-sidecar-${var.name}-${var.environment}" = {
image = "docker/ecs-searchdomain-sidecar"
tag = "1.0"
}
}

targets = [
{
name = "gc"
backend_protocol = "HTTP"
backend_port = 5005
target_type = aws_ecs_task_definition.grok_compute.network_mode == "awsvpc" ? "ip" : "instance"
health_check = {
enabled = true
interval = 60
unhealthy_threshold = 5
path = "/grok_compute/info"
matcher = "200"
}
},
{
name = "jkg"
backend_protocol = "HTTP"
backend_port = 8888
target_type = aws_ecs_task_definition.jkg.network_mode == "awsvpc" ? "ip" : "instance"
health_check = {
enabled = true
interval = 60
unhealthy_threshold = 5
path = "/jupyter/api/swagger.yaml"
matcher = "200"
}
},
{
name = "jkgH"
backend_protocol = "HTTP"
backend_port = 5005
target_type = aws_ecs_task_definition.jkg.network_mode == "awsvpc" ? "ip" : "instance"
health_check = {
enabled = true
interval = 60
unhealthy_threshold = 5
path = "/jupyter/helper/info"
matcher = "200"
}
},
{
name = "jn"
backend_protocol = "HTTP"
backend_port = 8889
target_type = aws_ecs_task_definition.jn.network_mode == "awsvpc" ? "ip" : "instance"
targets = {
jn = {
create_attachment = false
backend_protocol = "HTTP"
backend_port = 8889
target_type = aws_ecs_task_definition.jn.network_mode == "awsvpc" ? "ip" : "instance"
health_check = {
enabled = true
interval = 60
unhealthy_threshold = 5
path = "/notebook/api"
matcher = "200"
}
priority = 4
conditions = [{ path_pattern = { values = ["/notebook/helper/*"] } }]
},
{
name = "jnH"
backend_protocol = "HTTP"
backend_port = 5005
target_type = aws_ecs_task_definition.jn.network_mode == "awsvpc" ? "ip" : "instance"
jnH = {
create_attachment = false
backend_protocol = "HTTP"
backend_port = 5005
target_type = aws_ecs_task_definition.jn.network_mode == "awsvpc" ? "ip" : "instance"
health_check = {
enabled = true
interval = 60
unhealthy_threshold = 5
path = "/notebook/helper/info"
matcher = "200"
}
},
{
name = "h2oH"
backend_protocol = "HTTP"
backend_port = 5005
target_type = aws_ecs_task_definition.h2o.network_mode == "awsvpc" ? "ip" : "instance"
health_check = {
enabled = true
interval = 60
unhealthy_threshold = 5
path = "/helper/info"
matcher = "200"
}
},
{
name = "h2o"
backend_protocol = "HTTP"
backend_port = 54321
target_type = aws_ecs_task_definition.h2o.network_mode == "awsvpc" ? "ip" : "instance"
health_check = {
enabled = true
interval = 60
unhealthy_threshold = 5
path = "/3/About"
matcher = "200"
}
priority = 5
conditions = [{ path_pattern = { values = ["/notebook/*"] } }]
}
]
}
}

data "aws_availability_zones" "available" {
Expand Down
Loading
Loading