changes

Author: marcoacierno

backend/pdm.lock

@@ -94,6 +94,7 @@ dependencies = [
     "cryptography>=43.0.0",
     "openai>=1.52.0",
     "pydantic>=2.9.2",
+    "gunicorn>=23.0.0",
 ]
 name = "backend"
 version = "0.1.0"

backend/pyproject.toml

@@ -19,6 +19,10 @@ module "pretix" {
 module "pycon_backend" {
   source       = "./pycon_backend"
   ecs_arm_ami  = local.ecs_arm_ami
+  cluster_id = module.cluster.cluster_id
+  service_connect_namespace = module.cluster.service_connect_namespace
+  security_group_id = module.cluster.security_group_id
+  server_ip = module.cluster.server_ip
 
   providers = {
     aws    = aws
@@ -43,6 +47,7 @@ module "emails" {
 
 module "cluster" {
   source = "./cluster"
+  ecs_arm_ami  = local.ecs_arm_ami
 
   providers = {
     aws    = aws

infrastructure/applications/applications.tf

@@ -1,5 +1,6 @@
 resource "aws_ecs_task_definition" "traefik" {
   family = "pythonit-${terraform.workspace}-traefik"
+
   container_definitions = jsonencode([
     {
       name              = "traefik"
@@ -81,9 +82,4 @@ resource "aws_ecs_service" "traefik" {
       capacity_provider_strategy
     ]
   }
-
-  # placement_constraints {
-  #   type       = "memberOf"
-  #   expression = "attribute:role == load_balancer"
-  # }
 }

infrastructure/applications/cluster/auto_scaling.tf

@@ -2,32 +2,20 @@ resource "aws_ecs_cluster" "cluster" {
   name = "pythonit-${terraform.workspace}"
 }
 
-resource "aws_ecs_capacity_provider" "ec2" {
-  name = "pythonit-${terraform.workspace}-ec2"
-
-  auto_scaling_group_provider {
-    auto_scaling_group_arn         = aws_autoscaling_group.server.arn
-    managed_termination_protection = "ENABLED"
+output "cluster_id" {
+  value = aws_ecs_cluster.cluster.id
+}
 
-    managed_scaling {
-      maximum_scaling_step_size = 2
-      minimum_scaling_step_size = 1
-      status                    = "ENABLED"
-      target_capacity           = 1
-      instance_warmup_period    = 60
-    }
-  }
+resource "aws_service_discovery_http_namespace" "cluster" {
+  name        = "pythonit-${terraform.workspace}"
+  description = "pythonit-${terraform.workspace} service discovery namespace"
 }
 
-resource "aws_ecs_cluster_capacity_providers" "server" {
-  cluster_name = aws_ecs_cluster.cluster.name
-  capacity_providers = [
-    aws_ecs_capacity_provider.ec2.name,
-  ]
+output "service_connect_namespace" {
+  value = aws_service_discovery_http_namespace.cluster.arn
+}
 
-  default_capacity_provider_strategy {
-    base              = 1
-    weight            = 100
-    capacity_provider = aws_ecs_capacity_provider.ec2.name
-  }
+resource "aws_ecs_account_setting_default" "trunking" {
+  name  = "awsvpcTrunking"
+  value = "enabled"
 }