Sidekiq staging improvements (thewca#10453)

* align ram values of sidekiq staging and production * give sidekiq staging its own redis
danieljames-dj · Dec 21, 2024 · 1d736dc · 1d736dc
1 parent 80d4020
commit 1d736dc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/infra/wca_on_rails/production/auxiliary_services.tf b/infra/wca_on_rails/production/auxiliary_services.tf
@@ -14,14 +14,15 @@ resource "aws_ecs_task_definition" "auxiliary" {
   task_role_arn      = aws_iam_role.task_role.arn
 
   cpu = "1536"
-  memory = "6325"
+  memory = "3910"
 
   container_definitions = jsonencode([
+
     {
       name              = "sidekiq-main"
       image             = "${var.shared.ecr_repository.repository_url}:sidekiq-production"
       cpu    = 1024
-      memory = 5813
+      memory = 3398
       portMappings = []
       logConfiguration = {
         logDriver = "awslogs"

diff --git a/infra/wca_on_rails/staging/auxiliary_services.tf b/infra/wca_on_rails/staging/auxiliary_services.tf
@@ -13,16 +13,16 @@ resource "aws_ecs_task_definition" "auxiliary" {
   execution_role_arn = aws_iam_role.task_execution_role.arn
   task_role_arn      = aws_iam_role.task_role.arn
 
-  cpu = "512"
-  memory = "1536"
+  cpu = "1536"
+  memory = "3910"
 
   container_definitions = jsonencode([
 
     {
       name              = "sidekiq-staging"
       image             = "${var.shared.ecr_repository.repository_url}:sidekiq-staging"
-      cpu    = 256
-      memory = 1024
+      cpu    = 1024
+      memory = 3398
       portMappings = [{
         # Mailcatcher
         containerPort = 1080
@@ -48,7 +48,7 @@ resource "aws_ecs_task_definition" "auxiliary" {
     {
       name              = "pma-staging"
       image             = "${var.shared.ecr_repository.repository_url}:pma"
-      cpu    = 256
+      cpu    = 512
       memory = 512
       portMappings = [{
         # The hostPort is automatically set for awsvpc network mode,

diff --git a/infra/wca_on_rails/staging/rails.tf b/infra/wca_on_rails/staging/rails.tf
@@ -42,7 +42,7 @@ locals {
     },
     {
       name = "SIDEKIQ_REDIS_URL"
-      value = "redis://redis-main-staging-001.iebvzt.0001.usw2.cache.amazonaws.com:6379"
+      value = "redis://wca-staging-sidekiq-001.iebvzt.0001.usw2.cache.amazonaws.com:6379"
     },
     {
       name = "STAGING_OAUTH_URL"