Add memory request/limit for ComPAIR

ubc · Jan 15, 2022 · 65b1c3a · 65b1c3a
1 parent 05ff75b
commit 65b1c3a
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 1 deletion.
diff --git a/compair/Chart.yaml b/compair/Chart.yaml
@@ -6,7 +6,7 @@ keywords:
   - peer learning
   - education
 name: compair
-version: 0.6.5
+version: 0.6.6
 appVersion: 1.2.7
 home: http://ubc.github.io/compair/
 sources:

diff --git a/compair/templates/compair-deployment.yaml b/compair/templates/compair-deployment.yaml
@@ -256,6 +256,8 @@ spec:
           httpGet:
             path: /app/
             port: {{ .Values.app.service.internalPort }}
+        resources:
+{{ toYaml .Values.app.resources | indent 10 }}
       {{- if .Values.app.persistence.enabled }}
         volumeMounts:
         - name: {{ template "fullname" . }}-persistent-storage

diff --git a/compair/templates/compair-worker-deployment.yaml b/compair/templates/compair-worker-deployment.yaml
@@ -249,6 +249,8 @@ spec:
         - name: LOGIN_ADDITIONAL_INSTRUCTIONS_HTML
           value: {{ .Values.loginAdditionalInstructionsHTML | quote }}
         {{- end }}
+        resources:
+{{ toYaml .Values.worker.resources | indent 10 }}
       {{- if .Values.app.persistence.enabled }}
         volumeMounts:
         - name: {{ template "fullname" . }}-persistent-storage

diff --git a/compair/templates/compair-worker-scheduler-deployment.yaml b/compair/templates/compair-worker-scheduler-deployment.yaml
@@ -250,4 +250,6 @@ spec:
         - name: LOGIN_ADDITIONAL_INSTRUCTIONS_HTML
           value: {{ .Values.loginAdditionalInstructionsHTML | quote }}
         {{- end }}
+        resources:
+{{ toYaml .Values.scheduler.resources | indent 10 }}
 {{- end }}
diff --git a/compair/templates/mysql-deployment.yaml b/compair/templates/mysql-deployment.yaml
@@ -50,6 +50,8 @@ spec:
               key: mysql_password
         ports:
         - containerPort: 3306
+        resources:
+{{ toYaml .Values.db.resources | indent 10 }}
       {{- if .Values.db.persistence.enabled }}
         volumeMounts:
         - name: mysql-persistent-storage

diff --git a/compair/templates/redis-deployment.yaml b/compair/templates/redis-deployment.yaml
@@ -41,6 +41,8 @@ spec:
         volumeMounts:
         - name: redis-persistent-storage
           mountPath: /data
+        resources:
+{{ toYaml .Values.redis.resources | indent 10 }}
       volumes:
       - name: redis-persistent-storage
         persistentVolumeClaim:

diff --git a/compair/values.yaml b/compair/values.yaml
@@ -141,13 +141,36 @@ app:
       kubernetes.io/ingress.class: nginx
       kubernetes.io/tls-acme: "true"
       nginx.ingress.kubernetes.io/proxy-body-size: *uploadLimit
+  resources:
+    limits:
+    #  cpu: 100m
+      memory: 512Mi
+    requests:
+    #  cpu: 100m
+      memory: 256Mi
 
 worker:
   replicaCount: 1
   image:
     repository: ubcctlt/compair-app
     tag: latest
     pullPolicy: IfNotPresent
+  resources:
+    limits:
+    #  cpu: 100m
+      memory: 800Mi
+    requests:
+    #  cpu: 100m
+      memory: 512Mi
+
+scheduler:
+  resources:
+    limits:
+    #  cpu: 100m
+      memory: 100Mi
+    requests:
+    #  cpu: 100m
+      memory: 64Mi
 
 db:
   image:
@@ -159,6 +182,13 @@ db:
     #storageClass: fast
     #accessMode: ReadWriteOnce
     #size: 8Gi
+  resources:
+    limits:
+    #  cpu: 100m
+      memory: 512Mi
+    requests:
+    #  cpu: 100m
+      memory: 256Mi
 
 redis:
   image:
@@ -172,3 +202,10 @@ redis:
     #storageClass: fast
     #accessMode: ReadWriteOnce
     #size: 1Gi
+  resources:
+    limits:
+    #  cpu: 100m
+      memory: 100Mi
+    requests:
+    #  cpu: 100m
+      memory: 64Mi