HPCC-31566 Stop using stub resources for eclscheduler,toposerver,eclc…

…cserver Signed-off-by: Gavin Halliday <[email protected]>
hpcc-systems · Apr 23, 2024 · 9999f44 · 9999f44
1 parent 9092eb3
commit 9999f44
Show file tree

Hide file tree

Showing 6 changed files with 883 additions and 6 deletions.
diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl
@@ -1315,9 +1315,10 @@ Add resource object
 Pass in a dictionary with me defined
 */}}
 {{- define "hpcc.addResources" }}
-{{- if .me }}
- {{- $limits := omit .me "cpu" }}
- {{- $requests := pick .me "cpu" }}
+{{- $resources := .me | default .defaults }}
+{{- if $resources }}
+ {{- $limits := omit $resources "cpu" }}
+ {{- $requests := pick $resources "cpu" }}
 resources:
  {{- if $limits }}
   limits:

diff --git a/helm/hpcc/templates/eclccserver.yaml b/helm/hpcc/templates/eclccserver.yaml
@@ -180,7 +180,8 @@ spec:
 {{-  if .useChildProcesses }}
 {{-   include "hpcc.addResources" (dict "me" .resources) | indent 8 }}
 {{-  else }}
-{{-   include "hpcc.addStubResources" ($commonCtx | merge (dict "instances" .maxActive)) | indent 8 }}
+{{-   $defaultResources := dict "cpu" "1" "memory" "1Gi" }}
+{{-   include "hpcc.addResources" (dict "me" .timedChildResources "defaults" $defaultResources) | indent 8 }}
 {{-  end }}
 {{- end }}
 {{ include "hpcc.addImageAttrs" $commonCtx | indent 8 }}

diff --git a/helm/hpcc/templates/eclscheduler.yaml b/helm/hpcc/templates/eclscheduler.yaml
@@ -95,7 +95,8 @@ spec:
 {{- include "hpcc.addSecurityContext" $commonCtx | indent 8 }}
 {{- $omitResources := hasKey $.Values.global "omitResources" | ternary $.Values.global.omitResources $.Values.global.privileged }}
 {{- if not $omitResources }}
-{{- include "hpcc.addStubResources" ($commonCtx | merge (dict "instances" 1)) | indent 8 }}
+{{- $defaultResources := dict "cpu" "500m" "memory" "800Mi" }}
+{{- include "hpcc.addResources" (dict "me" .resources "defaults" $defaultResources) | indent 8 }}
 {{- end }}
 {{ include "hpcc.addImageAttrs" $commonCtx | indent 8 }}
         volumeMounts:

diff --git a/helm/hpcc/templates/roxie.yaml b/helm/hpcc/templates/roxie.yaml
@@ -148,7 +148,8 @@ spec:
 {{- include "hpcc.addSecurityContext" $commonCtx | indent 8 }}
 {{- $omitResources := hasKey $.Values.global "omitResources" | ternary $.Values.global.omitResources $.Values.global.privileged }}
 {{- if not $omitResources }}
-{{- include "hpcc.addStubResources" ($commonCtx | merge (dict "instances" 1)) | indent 8 }}
+{{- $defaultResources := dict "cpu" "500m" "memory" "500Mi" }}
+{{- include "hpcc.addResources" (dict "me" .topoResources "defaults" $defaultResources) | indent 8 }}
 {{- end }}
 {{ include "hpcc.addImageAttrs" $commonCtx | indent 8 }}
         workingDir: /var/lib/HPCCSystems

diff --git a/helm/hpcc/values.schema.json b/helm/hpcc/values.schema.json
@@ -1427,6 +1427,9 @@
         "resources": {
           "$ref": "#/definitions/resources"
         },
+        "timedChildResources": {
+          "$ref": "#/definitions/resources"
+        },
         "cost": {
           "$ref" : "#/definitions/componentCost"
         },
@@ -1724,6 +1727,9 @@
         "channelResources": {
           "$ref": "#/definitions/resources"
         },
+        "topoResources": {
+          "$ref": "#/definitions/resources"
+        },
         "annotations": {
           "type": "object",
           "additionalProperties": { "type": "string" }