From 05acebbf5b29b1bd0ea000c860dc521332785f83 Mon Sep 17 00:00:00 2001 From: Jacob Cody Wimer Date: Mon, 15 Aug 2022 23:26:44 +0000 Subject: [PATCH] Updated passenger pools for test deploy and moved workers to statefulsets in production --- README.md | 9 +++++++++ deploy/deploy-test.sh | 4 ++-- deploy/kubernetes/manifests/wrestlingdev.yaml | 10 +++------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index d00d1df..5e5dcb6 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,15 @@ To run a single test inside a file: 1. Get a shell with ruby and rails: `bash bin/rails-dev-run.sh wrestlingdev-development` 2. `rake test TEST=test/models/match_test.rb TESTOPTS="--name='/test_Match_should_not_be_valid_if_an_incorrect_win_type_is_given/'"` +## Update gems + +1. `bash bin/run-rails-dev.sh wrestlingdev-dev` to open a contianer with a rails shell available +2. `bundle config --delete without` to remove the bundle config that ignores production gems +3. `bundle update` + +Note: If updating rails, do not change the version in `Gemfile` until after you run `bash bin/run-rails-dev.sh wrestlingdev-dev`. Creating the container will fail due to a mismatch in Gemfile and Gemfile.lock. +Then run `rails app:update` to update rails. + # Deployment The production version of this is currently deployed in Kubernetes. See [Deploying with Kubernetes](deploy/kubernetes/README.md) diff --git a/deploy/deploy-test.sh b/deploy/deploy-test.sh index 199b571..ea67b5c 100755 --- a/deploy/deploy-test.sh +++ b/deploy/deploy-test.sh @@ -4,8 +4,8 @@ RAM_KB=$(grep MemTotal /proc/meminfo | awk '{print $2}') RAM_MB=$(expr $RAM_KB / 1024) RAM_GB=$(expr $RAM_MB / 1024) RAM_WITHOUT_OTHER_SERVICES=$(expr $RAM_MB - 1024) # other services use ~1024MB of RAM -PASSENGER_POOL_FACTOR=$(expr $RAM_WITHOUT_OTHER_SERVICES / 256) # 2 pool workers use ~256MB of RAM -export PASSENGER_POOL_SIZE=$(expr $PASSENGER_POOL_FACTOR '*' 2) +PASSENGER_POOL_FACTOR=$(expr $RAM_WITHOUT_OTHER_SERVICES / 256) # 1 pool worker uses ~256MB of RAM +export PASSENGER_POOL_SIZE=$(expr $PASSENGER_POOL_FACTOR '*' 1) #docker build -t wrestlingdev:test -f ${project_dir}/deploy/rails-prod-Dockerfile ${project_dir} docker-compose -f ${project_dir}/deploy/docker-compose-test.yml kill diff --git a/deploy/kubernetes/manifests/wrestlingdev.yaml b/deploy/kubernetes/manifests/wrestlingdev.yaml index 04455f8..815c462 100644 --- a/deploy/kubernetes/manifests/wrestlingdev.yaml +++ b/deploy/kubernetes/manifests/wrestlingdev.yaml @@ -134,9 +134,9 @@ spec: # targetAverageValue: 100Mi --- apiVersion: apps/v1 -kind: Deployment +kind: StatefulSet metadata: - name: wrestlingdev-worker-deployment + name: wrestlingdev-worker labels: app: wrestlingdev spec: @@ -144,6 +144,7 @@ spec: selector: matchLabels: app: wrestlingdev + serviceName: wrestlingdev-worker template: metadata: labels: @@ -188,11 +189,6 @@ spec: secretKeyRef: name: wrestlingdev-secrets key: railssecretkey - - name: WRESTLINGDEV_SECRET_KEY_BASE - valueFrom: - secretKeyRef: - name: wrestlingdev-secrets - key: railssecretkey - name: WRESTLINGDEV_EMAIL_PWD valueFrom: secretKeyRef: