Skip to content

Commit

Permalink
Bump ecs to v3.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
RyanWhite25 committed Dec 13, 2024
1 parent 834db09 commit 721ff05
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ tf_init: ## Initialise terraform
.PHONY: tf_plan
tf_plan: ## Plan terraform
make tf_init_and_set_workspace && \
terraform -chdir=./infrastructure/$(instance) plan -var-file=$(CONFIG_DIR)/${env}-input-params.tfvars ${tf_build_args}
terraform -chdir=./infrastructure/$(instance) plan -var-file=$(CONFIG_DIR)/${env}-input-params.tfvars ${tf_build_args} ${args}

.PHONY: tf_apply
tf_apply: ## Apply terraform
Expand Down
10 changes: 6 additions & 4 deletions infrastructure/ecs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,16 @@ locals {
module "ecs" {
# checkov:skip=CKV_TF_1: We're using semantic versions instead of commit hash
#source = "../../i-dot-ai-core-terraform-modules//modules/infrastructure/ecs" # For testing local changes
source = "git::https://github.com/i-dot-ai/i-dot-ai-core-terraform-modules.git//modules/infrastructure/ecs?ref=v1.0.0-ecs"
source = "git::https://github.com/i-dot-ai/i-dot-ai-core-terraform-modules.git//modules/infrastructure/ecs?ref=v3.1.1-ecs"
name = local.name
image_tag = var.image_tag
ecr_repository_uri = var.ecr_repository_uri
ecs_cluster_id = data.terraform_remote_state.platform.outputs.ecs_cluster_id
ecs_cluster_name = data.terraform_remote_state.platform.outputs.ecs_cluster_name
memory = local.ecs_memory
cpu = local.ecs_cpus
certificate_arn = data.terraform_remote_state.universal.outputs.certificate_arn

health_check = {
healthy_threshold = 3
unhealthy_threshold = 3
Expand All @@ -52,7 +54,6 @@ module "ecs" {
}
environment_variables = local.ecs_env_vars

state_bucket = var.state_bucket
vpc_id = data.terraform_remote_state.vpc.outputs.vpc_id
private_subnets = data.terraform_remote_state.vpc.outputs.private_subnets
container_port = "8000"
Expand All @@ -72,14 +73,16 @@ module "ecs" {
module "worker" {
# checkov:skip=CKV_TF_1: We're using semantic versions instead of commit hash
#source = "../../i-dot-ai-core-terraform-modules//modules/infrastructure/ecs" # For testing local changes
source = "git::https://github.com/i-dot-ai/i-dot-ai-core-terraform-modules.git//modules/infrastructure/ecs?ref=v1.0.0-ecs"
source = "git::https://github.com/i-dot-ai/i-dot-ai-core-terraform-modules.git//modules/infrastructure/ecs?ref=v3.1.1-ecs"
name = "${local.name}-worker"
image_tag = var.image_tag
ecr_repository_uri = var.ecr_repository_uri
ecs_cluster_id = data.terraform_remote_state.platform.outputs.ecs_cluster_id
ecs_cluster_name = data.terraform_remote_state.platform.outputs.ecs_cluster_name
memory = local.ecs_memory
cpu = local.ecs_cpus
certificate_arn = data.terraform_remote_state.universal.outputs.certificate_arn

health_check = {
healthy_threshold = 3
unhealthy_threshold = 3
Expand All @@ -90,7 +93,6 @@ module "worker" {
}
environment_variables = local.ecs_env_vars

state_bucket = var.state_bucket
vpc_id = data.terraform_remote_state.vpc.outputs.vpc_id
private_subnets = data.terraform_remote_state.vpc.outputs.private_subnets
container_port = "8000"
Expand Down

0 comments on commit 721ff05

Please sign in to comment.