feat: allow configuration of resource limits

More reasonable default memory limits are also configured. Signed-off-by: Davide Madrisan <[email protected]>
getlago · Apr 8, 2024 · 536d882 · 536d882
1 parent bbf86f3
commit 536d882
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 30 deletions.
diff --git a/templates/api-deployment.yaml b/templates/api-deployment.yaml
@@ -193,10 +193,10 @@ spec:
             httpGet:
               path: /health
               port: http
+          {{- with .Values.api.resources }}
           resources:
-            requests:
-              memory: {{ .Values.api.resources.memory }}
-              cpu: {{ .Values.api.resources.cpu }}
+            {{- toYaml . | nindent 12}}
+          {{- end }}
           {{ if not .Values.global.s3.enabled }}
           volumeMounts:
             - mountPath: /app/storage

diff --git a/templates/clock-deployment.yaml b/templates/clock-deployment.yaml
@@ -87,9 +87,9 @@ spec:
             {{ end }}
           image: getlago/api:v{{ .Values.version }}
           name: {{ .Release.Name }}-clock
+          {{- with .Values.clock.resources }}
           resources:
-            requests:
-              memory: {{ .Values.clock.resources.memory }}
-              cpu: {{ .Values.clock.resources.cpu }}
+            {{- toYaml . | nindent 12}}
+          {{- end }}
       restartPolicy: Always
       serviceAccountName: {{ .Values.global.serviceAccountName | default (printf "%s-serviceaccount" .Release.Name) }}
diff --git a/templates/events-worker-deployment.yaml b/templates/events-worker-deployment.yaml
@@ -103,10 +103,10 @@ spec:
             {{ end }}
           image: getlago/api:v{{ .Values.version }}
           name: {{ .Release.Name }}-events-worker
+          {{- with .Values.eventsWorker.resources }}
           resources:
-            requests:
-              memory: {{ .Values.eventsWorker.resources.memory }}
-              cpu: {{ .Values.eventsWorker.resources.cpu }}
+            {{- toYaml . | nindent 12}}
+          {{- end }}
           livenessProbe:
             exec:
               command: ["/bin/bash", "-l", "-c", "bundle exec sidekiqmon processes | grep $(hostname) || exit 1"]

diff --git a/templates/front-deployment.yaml b/templates/front-deployment.yaml
@@ -36,8 +36,8 @@ spec:
           ports:
             - containerPort: 80
               protocol: TCP
+          {{- with .Values.front.resources }}
           resources:
-            requests:
-              memory: {{ .Values.front.resources.memory }}
-              cpu: {{ .Values.front.resources.cpu }}
+            {{- toYaml . | nindent 12}}
+          {{- end }}
       restartPolicy: Always
diff --git a/templates/pdf-deployment.yaml b/templates/pdf-deployment.yaml
@@ -27,8 +27,8 @@ spec:
           ports:
             - containerPort: 3000
               protocol: TCP
+          {{- with .Values.pdf.resources }}
           resources:
-            requests:
-              memory: {{ .Values.pdf.resources.memory }}
-              cpu: {{ .Values.pdf.resources.cpu }}
+            {{- toYaml . | nindent 12}}
+          {{- end }}
       restartPolicy: Always
diff --git a/templates/worker-deployment.yaml b/templates/worker-deployment.yaml
@@ -166,10 +166,10 @@ spec:
           livenessProbe:
             exec:
               command: ["/bin/bash", "-l", "-c", "bundle exec sidekiqmon processes | grep $(hostname) || exit 1"]
+          {{- with .Values.worker.resources }}
           resources:
-            requests:
-              memory: {{ .Values.worker.resources.memory }}
-              cpu: {{ .Values.worker.resources.cpu }}
+            {{- toYaml . | nindent 12}}
+          {{- end }}
           {{ if not .Values.global.s3.enabled }}
           volumeMounts:
             - mountPath: /app/storage

diff --git a/values.yaml b/values.yaml
@@ -98,8 +98,9 @@ front:
   service:
     port: 80
   resources:
-    memory: 512
-    cpu: "200m"
+    requests:
+      memory: 512Mi
+      cpu: "200m"
   podAnnotations: {}
   podLabels: {}
 
@@ -116,8 +117,9 @@ api:
   sidekiqWeb:
     enabled: true
   resources:
-    memory: 1024
-    cpu: "1000m"
+    requests:
+      memory: 1Gi
+      cpu: "1000m"
   volumes:
     storage: "10Gi"
   podAnnotations: {}
@@ -131,8 +133,9 @@ worker:
     logStdout: true
     logLevel: error
   resources:
-    memory: 1024
-    cpu: "1000m"
+    requests:
+      memory: 1Gi
+      cpu: "1000m"
   podAnnotations: {}
   podLabels: {}
 
@@ -144,8 +147,9 @@ eventsWorker:
     logStdout: true
     logLevel: error
   resources:
-    memory: 1024
-    cpu: "1000m"
+    requests:
+      memory: 1Gi
+      cpu: "1000m"
   podAnnotations: {}
   podLabels: {}
 
@@ -156,8 +160,9 @@ clock:
     logStdout: true
     logLevel: info
   resources:
-    memory: 256
-    cpu: "100m"
+    requests:
+      memory: 256Mi
+      cpu: "100m"
   podAnnotations: {}
   podLabels: {}
 
@@ -166,12 +171,14 @@ pdf:
   service:
     port: 3001
   resources:
-    memory: 2048
-    cpu: "1000m"
+    requests:
+      memory: 2Gi
+      cpu: "1000m"
   podAnnotations: {}
   podLabels: {}
 
 job:
   migrate:
     podAnnotations: {}
     podLabels: {}
+    resources: {}