Skip to content

Commit 64ea60c

Browse files
sungurokusunguroku
authored
Merge pull request #1198 from chronograph-pe/nb/cpu-mem-limits
allow setting distinct cpu/memory limits
2 parents 3beb35a + d0ce450 commit 64ea60c

File tree

8 files changed

+59
-20
lines changed

8 files changed

+59
-20
lines changed

‎applications/job/templates/cronjob.yaml

+10-2
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,18 @@ spec:
131131
cpu: {{ .Values.resources.requests.cpu }}
132132
memory: {{ .Values.resources.requests.memory }}
133133
limits:
134-
{{- if (.Values.resources.setCPULimits) }}
134+
{{- if .Values.resources.setCPULimits }}
135+
{{- if .Values.resources.limits.cpu }}
136+
cpu: {{ .Values.resources.limits.cpu }}
137+
{{- else }}
135138
cpu: {{ .Values.resources.requests.cpu }}
136-
{{ end }}
139+
{{- end }}
140+
{{- end }}
141+
{{- if .Values.resources.limits.memory }}
142+
memory: {{ .Values.resources.limits.memory }}
143+
{{- else }}
137144
memory: {{ .Values.resources.requests.memory }}
145+
{{- end }}
138146
- name: sidecar
139147
image: ghcr.io/porter-dev/job_sidecar_container:latest
140148
imagePullPolicy: Always

‎applications/job/templates/hook-configmap.yaml

+10-2
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,18 @@ data:
137137
cpu: {{ .Values.resources.requests.cpu }}
138138
memory: {{ .Values.resources.requests.memory }}
139139
limits:
140-
{{- if (.Values.resources.setCPULimits) }}
140+
{{- if .Values.resources.setCPULimits }}
141+
{{- if .Values.resources.limits.cpu }}
142+
cpu: {{ .Values.resources.limits.cpu }}
143+
{{- else }}
141144
cpu: {{ .Values.resources.requests.cpu }}
142-
{{ end }}
145+
{{- end }}
146+
{{- end }}
147+
{{- if .Values.resources.limits.memory }}
148+
memory: {{ .Values.resources.limits.memory }}
149+
{{- else }}
143150
memory: {{ .Values.resources.requests.memory }}
151+
{{- end }}
144152
- name: sidecar
145153
image: ghcr.io/porter-dev/job_sidecar_container:latest
146154
imagePullPolicy: Always

‎applications/job/values.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ resources:
4141
cpu: 100m
4242
memory: 256Mi
4343
setCPULimits: false
44+
limits: {}
4445

4546
paused: false
4647

‎applications/web/templates/deployment-blue-green.yaml

+12-4
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,18 @@ spec:
162162
cpu: {{ $.Values.resources.requests.cpu }}
163163
memory: {{ $.Values.resources.requests.memory }}
164164
limits:
165-
{{- if ($.Values.resources.setCPULimits) }}
166-
cpu: {{ $.Values.resources.requests.cpu }}
167-
{{ end }}
168-
memory: {{ $.Values.resources.requests.memory }}
165+
{{- if .Values.resources.setCPULimits }}
166+
{{- if .Values.resources.limits.cpu }}
167+
cpu: {{ .Values.resources.limits.cpu }}
168+
{{- else }}
169+
cpu: {{ .Values.resources.requests.cpu }}
170+
{{- end }}
171+
{{- end }}
172+
{{- if .Values.resources.limits.memory }}
173+
memory: {{ .Values.resources.limits.memory }}
174+
{{- else }}
175+
memory: {{ .Values.resources.requests.memory }}
176+
{{- end }}
169177
env:
170178
# Porter default environment variables
171179
- name: PORTER_NODE_NAME

‎applications/web/templates/deployment.yaml

+12-6
Original file line numberDiff line numberDiff line change
@@ -207,15 +207,21 @@ spec:
207207
{{ end }}
208208
{{ end }}
209209
limits:
210-
{{- if (.Values.resources.setCPULimits) }}
210+
{{- if .Values.resources.setCPULimits }}
211+
{{- if .Values.resources.limits.cpu }}
212+
cpu: {{ .Values.resources.limits.cpu }}
213+
{{- else }}
211214
cpu: {{ .Values.resources.requests.cpu }}
212-
{{ end }}
215+
{{- end }}
216+
{{- end }}
217+
{{- if .Values.resources.limits.memory }}
218+
memory: {{ .Values.resources.limits.memory }}
219+
{{- else }}
213220
memory: {{ .Values.resources.requests.memory }}
214-
{{ if .Values.resources.limits }}
215-
{{ if .Values.resources.limits.nvidiaGpu }}
221+
{{- end }}
222+
{{- if .Values.resources.limits.nvidiaGpu }}
216223
nvidia.com/gpu: {{ .Values.resources.limits.nvidiaGpu }}
217-
{{ end }}
218-
{{ end }}
224+
{{- end }}
219225
{{ if or .Values.configMapRefs .Values.secretRefs }}
220226
envFrom:
221227
{{ range $configMapName := .Values.configMapRefs }}

‎applications/web/values.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ resources:
104104
cpu: 100m
105105
memory: 256Mi
106106
setCPULimits: false
107+
limits: {}
107108

108109
autoscaling:
109110
enabled: false

‎applications/worker/templates/deployment.yaml

+12-6
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,21 @@ spec:
167167
{{ end }}
168168
{{ end }}
169169
limits:
170-
{{- if (.Values.resources.setCPULimits) }}
170+
{{- if .Values.resources.setCPULimits }}
171+
{{- if .Values.resources.limits.cpu }}
172+
cpu: {{ .Values.resources.limits.cpu }}
173+
{{- else }}
171174
cpu: {{ .Values.resources.requests.cpu }}
172-
{{ end }}
175+
{{- end }}
176+
{{- end }}
177+
{{- if .Values.resources.limits.memory }}
178+
memory: {{ .Values.resources.limits.memory }}
179+
{{- else }}
173180
memory: {{ .Values.resources.requests.memory }}
174-
{{ if .Values.resources.limits }}
175-
{{ if .Values.resources.limits.nvidiaGpu }}
181+
{{- end }}
182+
{{- if .Values.resources.limits.nvidiaGpu }}
176183
nvidia.com/gpu: {{ .Values.resources.limits.nvidiaGpu }}
177-
{{ end }}
178-
{{ end }}
184+
{{- end }}
179185
{{ if or .Values.configMapRefs .Values.secretRefs }}
180186
envFrom:
181187
{{ range $configMapName := .Values.configMapRefs }}

‎applications/worker/values.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ resources:
4646
cpu: 100m
4747
memory: 256Mi
4848
setCPULimits: false
49+
limits: {}
4950

5051
autoscaling:
5152
enabled: false

0 commit comments

Comments
 (0)