Move resource allocation to the api container (#15)

OSMCha · Feb 22, 2024 · c72b671 · c72b671
1 parent 46d67fb
commit c72b671
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/helm/osmcha/templates/app.yaml b/helm/osmcha/templates/app.yaml
@@ -37,13 +37,6 @@ spec:
           python manage.py collectstatic --noinput
           mkdir -p /staticfiles/static
           cp -r /app/staticfiles/* /staticfiles/static/
-        resources:
-          requests:
-            cpu: "2"
-            memory: "6Gi"
-          limits:
-            cpu: "2"
-            memory: "6Gi"
 
         env:
         - name: POSTGRES_HOST
@@ -91,6 +84,8 @@ spec:
         - --access-logfile
         - "-"
         - config.wsgi
+        resources:
+          {{- toYaml .Values.app.api.resources | nindent 10 }}
         env:
         - name: POSTGRES_HOST
           value: {{ .Values.app.api.postgres_host}}

diff --git a/helm/osmcha/values.yaml b/helm/osmcha/values.yaml
@@ -15,14 +15,20 @@ app:
     image:
       repository: ghcr.io/osmcha/osmcha-django
       tag: f267991c1d35929763bfb7a75dfd1e75afe01c69
+    resources:
+      requests:
+        memory: "2G"
+        cpu: "1"
+      limits:
+        memory: "4G"
+        cpu: "2"
     postgres_host: osmcha-database.cz9ktd5n6tn5.us-east-1.rds.amazonaws.com
     postgres_user: postgres
     postgres_database: osmcha
     redis_url: redis://redis-master:6379
 
   # OSMCha frontend - runs as a sidecar to the API
   ui:
-    replicas: 1
     nodeSelector: {}
     image:
       repository: ghcr.io/osmcha/osmcha-frontend