diff --git a/terraform/deploy.tf b/terraform/deploy.tf index 38f21b50..6457437d 100644 --- a/terraform/deploy.tf +++ b/terraform/deploy.tf @@ -3,6 +3,7 @@ variable "execution_role_arn" {} variable "ecs_cluster" {} variable "local_namespace" {} variable "desired_count" {} +variable "background_desired_count" {} variable "http_listener_sg" { default = "sg-0024906e0e1f78048" @@ -76,7 +77,7 @@ resource "aws_ecs_service" "integreat_background_worker" { name = "integreat_background_worker_${var.stage}" cluster = var.ecs_cluster task_definition = aws_ecs_task_definition.integreat_background_worker.arn - desired_count = 1 + desired_count = var.background_desired_count deployment_controller { type = "ECS" } diff --git a/terraform/prod.tfvars b/terraform/prod.tfvars index c1441e38..6911fc6f 100644 --- a/terraform/prod.tfvars +++ b/terraform/prod.tfvars @@ -10,3 +10,4 @@ ecs_cluster="arn:aws:ecs:us-east-1:679918342773:cluster/default" # service_registry="arn:aws:servicediscovery:us-east-1:679918342773:service/srv-6auj2wqsh55k2nuj" local_namespace="ns-gv2z744em7myo2jp" desired_count=4 +background_desired_count=1 diff --git a/terraform/staging.tfvars b/terraform/staging.tfvars index 92c29c26..8c32ec7c 100644 --- a/terraform/staging.tfvars +++ b/terraform/staging.tfvars @@ -9,4 +9,5 @@ execution_role_arn="arn:aws:iam::679918342773:role/ecsTaskExecutionRole" ecs_cluster="arn:aws:ecs:us-east-1:679918342773:cluster/default" # service_registry="arn:aws:servicediscovery:us-east-1:679918342773:service/srv-6auj2wqsh55k2nuj" local_namespace="ns-gv2z744em7myo2jp" -desired_count=1 +desired_count=0 +background_desired_count=0 diff --git a/terraform/terraform.tfstate.d/staging/terraform.tfstate b/terraform/terraform.tfstate.d/staging/terraform.tfstate index a5867a32..c41f831b 100644 --- a/terraform/terraform.tfstate.d/staging/terraform.tfstate +++ b/terraform/terraform.tfstate.d/staging/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 4, - "terraform_version": "0.14.4", - "serial": 107, + "terraform_version": "1.2.2", + "serial": 111, "lineage": "91d10fe0-8033-8778-c202-78d5a81632e8", "outputs": { "aws_access_key_id": { @@ -107,7 +107,7 @@ ], "deployment_maximum_percent": 200, "deployment_minimum_healthy_percent": 100, - "desired_count": 1, + "desired_count": 0, "enable_ecs_managed_tags": false, "enable_execute_command": false, "force_new_deployment": null, @@ -153,7 +153,7 @@ ], "tags": {}, "tags_all": {}, - "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_staging:105", + "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_staging:137", "timeouts": { "delete": null }, @@ -193,7 +193,7 @@ ], "deployment_maximum_percent": 200, "deployment_minimum_healthy_percent": 100, - "desired_count": 1, + "desired_count": 0, "enable_ecs_managed_tags": false, "enable_execute_command": false, "force_new_deployment": null, @@ -232,7 +232,7 @@ ], "tags": {}, "tags_all": {}, - "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_staging:25", + "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_staging:57", "timeouts": { "delete": null }, @@ -313,7 +313,7 @@ ], "revision": 26, "runtime_platform": [], - "tags": null, + "tags": {}, "tags_all": {}, "task_role_arn": "arn:aws:iam::679918342773:role/datomic-ddb", "volume": [] diff --git a/terraform/terraform.tfstate.d/staging/terraform.tfstate.backup b/terraform/terraform.tfstate.d/staging/terraform.tfstate.backup index 32a917e4..7c0b9dab 100644 --- a/terraform/terraform.tfstate.d/staging/terraform.tfstate.backup +++ b/terraform/terraform.tfstate.d/staging/terraform.tfstate.backup @@ -1,7 +1,7 @@ { "version": 4, - "terraform_version": "0.14.4", - "serial": 104, + "terraform_version": "1.2.2", + "serial": 107, "lineage": "91d10fe0-8033-8778-c202-78d5a81632e8", "outputs": { "aws_access_key_id": { @@ -275,7 +275,7 @@ ], "revision": 106, "runtime_platform": [], - "tags": null, + "tags": {}, "tags_all": {}, "task_role_arn": "arn:aws:iam::679918342773:role/datomic-ddb", "volume": [] @@ -292,10 +292,9 @@ "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", "instances": [ { - "status": "tainted", "schema_version": 1, "attributes": { - "arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_staging:23", + "arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_staging:26", "container_definitions": "[{\"cpu\":0,\"dockerLabels\":{\"com.datadoghq.tags.env\":\"staging\",\"com.datadoghq.tags.service\":\"integreat-background-worker\"},\"environment\":[{\"name\":\"DD_ENV\",\"value\":\"staging\"},{\"name\":\"DD_SERVICE\",\"value\":\"integreat-background-worker\"},{\"name\":\"config\",\"value\":\"/usr/local/config/staging-background-worker.edn\"}],\"essential\":true,\"image\":\"679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat:staging\",\"logConfiguration\":{\"logDriver\":\"awslogs\",\"options\":{\"awslogs-group\":\"/ecs/integreat-background-worker-staging\",\"awslogs-region\":\"us-east-1\",\"awslogs-stream-prefix\":\"ecs\"}},\"mountPoints\":[],\"name\":\"integreat-app\",\"portMappings\":[{\"containerPort\":9000,\"hostPort\":9000,\"protocol\":\"tcp\"},{\"containerPort\":9090,\"hostPort\":9090,\"protocol\":\"tcp\"}],\"volumesFrom\":[]},{\"cpu\":0,\"environment\":[{\"name\":\"DD_API_KEY\",\"value\":\"ce10d932c47b358e81081ae67bd8c112\"},{\"name\":\"ECS_FARGATE\",\"value\":\"true\"}],\"essential\":true,\"image\":\"public.ecr.aws/datadog/agent:latest\",\"mountPoints\":[],\"name\":\"datadog-agent\",\"portMappings\":[],\"volumesFrom\":[]}]", "cpu": "1024", "ephemeral_storage": [], @@ -312,9 +311,9 @@ "requires_compatibilities": [ "FARGATE" ], - "revision": 23, + "revision": 26, "runtime_platform": [], - "tags": {}, + "tags": null, "tags_all": {}, "task_role_arn": "arn:aws:iam::679918342773:role/datomic-ddb", "volume": []