Merge pull request #17498 from jakesmith/HPCC-29813-remove-cpu-limit

HPCC-29813 Change cpu limits to requests Reviewed-by: Mark Kelly [email protected] Reviewed-By: Richard Chapman <[email protected]> Reviewed-by: Gavin Halliday <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Jun 29, 2023 · e9df217 · e9df217
2 parents e07569d + c29dfce
commit e9df217
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl
@@ -1115,11 +1115,19 @@ Add resource object
 Pass in a dictionary with me defined
 */}}
 {{- define "hpcc.addResources" }}
-{{- if .me  }}
+{{- if .me }}
+ {{- $limits := omit .me "cpu" }}
+ {{- $requests := pick .me "cpu" }}
 resources:
+ {{- if $limits }}
   limits:
-{{ toYaml .me | indent 4 }}
-{{- end }}
+  {{- toYaml $limits | nindent 4 }}
+ {{- end -}}
+ {{- if $requests }}
+  requests:
+  {{- toYaml $requests | nindent 4 -}}
+ {{- end -}}
+{{- end -}}
 {{- end -}}
 
 {{/*
@@ -1135,8 +1143,9 @@ Pass in dict with root, me and instances defined
 {{- $totalBytes := mul .instances $bytes }}
 resources:
   limits:
-    cpu: {{ printf "%dm" (mul .instances $milliCPUs) | quote }}
     memory: {{ include "hpcc.bytesToK8sMemoryString" $totalBytes | quote }}
+  requests:
+    cpu: {{ printf "%dm" (mul .instances $milliCPUs) | quote }}
 {{- end -}}
 
 {{/*