Merge pull request #1201 from porter-dev/main

Set Custom Resource limits
porter-dev · Feb 8, 2024 · 9130651 · 9130651
2 parents a2988fe + 64ea60c
commit 9130651
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 20 deletions.
diff --git a/applications/job/templates/cronjob.yaml b/applications/job/templates/cronjob.yaml
@@ -131,10 +131,18 @@ spec:
                 cpu: {{ .Values.resources.requests.cpu }}
                 memory: {{ .Values.resources.requests.memory }}
               limits:
-                {{- if (.Values.resources.setCPULimits) }}
+                {{- if .Values.resources.setCPULimits }}
+                  {{- if .Values.resources.limits.cpu }}
+                cpu: {{ .Values.resources.limits.cpu }}
+                  {{- else }}
                 cpu: {{ .Values.resources.requests.cpu }}
-                {{ end }}
+                  {{- end }}
+                {{- end }}
+                {{- if .Values.resources.limits.memory }}
+                memory: {{ .Values.resources.limits.memory }}
+                {{- else }}
                 memory: {{ .Values.resources.requests.memory }}
+                {{- end }}
           - name: sidecar
             image: ghcr.io/porter-dev/job_sidecar_container:latest
             imagePullPolicy: Always

diff --git a/applications/job/templates/hook-configmap.yaml b/applications/job/templates/hook-configmap.yaml
@@ -137,10 +137,18 @@ data:
                 cpu: {{ .Values.resources.requests.cpu }}
                 memory: {{ .Values.resources.requests.memory }}
               limits:
-                {{- if (.Values.resources.setCPULimits) }}
+                {{- if .Values.resources.setCPULimits }}
+                  {{- if .Values.resources.limits.cpu }}
+                cpu: {{ .Values.resources.limits.cpu }}
+                  {{- else }}
                 cpu: {{ .Values.resources.requests.cpu }}
-                {{ end }}
+                  {{- end }}
+                {{- end }}
+                {{- if .Values.resources.limits.memory }}
+                memory: {{ .Values.resources.limits.memory }}
+                {{- else }}
                 memory: {{ .Values.resources.requests.memory }}
+                {{- end }}
           - name: sidecar
             image: ghcr.io/porter-dev/job_sidecar_container:latest
             imagePullPolicy: Always

diff --git a/applications/job/values.yaml b/applications/job/values.yaml
@@ -41,6 +41,7 @@ resources:
     cpu: 100m
     memory: 256Mi
   setCPULimits: false
+  limits: {}
 
 paused: false
 

diff --git a/applications/web/templates/deployment-blue-green.yaml b/applications/web/templates/deployment-blue-green.yaml
@@ -162,10 +162,18 @@ spec:
               cpu: {{ $.Values.resources.requests.cpu }}
               memory: {{ $.Values.resources.requests.memory }}
             limits:
-              {{- if ($.Values.resources.setCPULimits) }}
-              cpu: {{ $.Values.resources.requests.cpu }}
-              {{ end }}
-              memory: {{ $.Values.resources.requests.memory }}
+              {{- if .Values.resources.setCPULimits }}
+                {{- if .Values.resources.limits.cpu }}
+              cpu: {{ .Values.resources.limits.cpu }}
+                {{- else }}
+              cpu: {{ .Values.resources.requests.cpu }}
+                {{- end }}
+              {{- end }}
+              {{- if .Values.resources.limits.memory }}
+              memory: {{ .Values.resources.limits.memory }}
+              {{- else }}
+              memory: {{ .Values.resources.requests.memory }}
+              {{- end }}
           env:
             # Porter default environment variables
             - name: PORTER_NODE_NAME

diff --git a/applications/web/templates/deployment.yaml b/applications/web/templates/deployment.yaml
@@ -207,15 +207,21 @@ spec:
           {{ end }}
           {{ end }}
             limits:
-              {{- if (.Values.resources.setCPULimits) }}
+              {{- if .Values.resources.setCPULimits }}
+                {{- if .Values.resources.limits.cpu }}
+              cpu: {{ .Values.resources.limits.cpu }}
+                {{- else }}
               cpu: {{ .Values.resources.requests.cpu }}
-              {{ end }}
+                {{- end }}
+              {{- end }}
+              {{- if .Values.resources.limits.memory }}
+              memory: {{ .Values.resources.limits.memory }}
+              {{- else }}
               memory: {{ .Values.resources.requests.memory }}
-          {{ if .Values.resources.limits }}
-          {{ if .Values.resources.limits.nvidiaGpu }}
+              {{- end }}
+              {{- if .Values.resources.limits.nvidiaGpu }}
               nvidia.com/gpu: {{ .Values.resources.limits.nvidiaGpu }}
-          {{ end }}
-          {{ end }}
+              {{- end }}
           {{ if or .Values.configMapRefs .Values.secretRefs }}
           envFrom:
           {{ range $configMapName := .Values.configMapRefs }}

diff --git a/applications/web/values.yaml b/applications/web/values.yaml
@@ -104,6 +104,7 @@ resources:
     cpu: 100m
     memory: 256Mi
   setCPULimits: false
+  limits: {}
 
 autoscaling:
   enabled: false

diff --git a/applications/worker/templates/deployment.yaml b/applications/worker/templates/deployment.yaml
@@ -167,15 +167,21 @@ spec:
           {{ end }}
           {{ end }}
             limits:
-              {{- if (.Values.resources.setCPULimits) }}
+              {{- if .Values.resources.setCPULimits }}
+                {{- if .Values.resources.limits.cpu }}
+              cpu: {{ .Values.resources.limits.cpu }}
+                {{- else }}
               cpu: {{ .Values.resources.requests.cpu }}
-              {{ end }}
+                {{- end }}
+              {{- end }}
+              {{- if .Values.resources.limits.memory }}
+              memory: {{ .Values.resources.limits.memory }}
+              {{- else }}
               memory: {{ .Values.resources.requests.memory }}
-          {{ if .Values.resources.limits }}
-          {{ if .Values.resources.limits.nvidiaGpu }}
+              {{- end }}
+              {{- if .Values.resources.limits.nvidiaGpu }}
               nvidia.com/gpu: {{ .Values.resources.limits.nvidiaGpu }}
-          {{ end }}
-          {{ end }}
+              {{- end }}
           {{ if or .Values.configMapRefs .Values.secretRefs }}
           envFrom:
           {{ range $configMapName := .Values.configMapRefs }}

diff --git a/applications/worker/values.yaml b/applications/worker/values.yaml
@@ -46,6 +46,7 @@ resources:
     cpu: 100m
     memory: 256Mi
   setCPULimits: false
+  limits: {}
 
 autoscaling:
   enabled: false