From 2dadbcf6c2dbe62f3594decc391f3eabd85ea175 Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Tue, 28 Nov 2023 11:49:18 +0000 Subject: [PATCH] HPCC-30913 Merge fix Signed-off-by: Jake Smith --- helm/hpcc/templates/thor.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/hpcc/templates/thor.yaml b/helm/hpcc/templates/thor.yaml index 312776833ca..c5e45187954 100644 --- a/helm/hpcc/templates/thor.yaml +++ b/helm/hpcc/templates/thor.yaml @@ -32,7 +32,7 @@ Pass in dict with root and me {{- $thorAgentScope := dict "name" .thorAgentName "replicas" .thorAgentReplicas "maxActive" .me.maxGraphs | merge (pick .me "keepJobs" "logging" "tracing") }} {{- $eclAgentResources := .me.eclAgentResources | default dict -}} {{- $hthorScope := dict "name" $hthorName "jobMemorySectionName" "eclAgentMemory" | merge (pick .me "multiJobLinger" "maxGraphStartupTime" "logging" "tracing") | merge (dict "resources" (deepCopy $eclAgentResources)) }} -{{- $thorScope := omit .me "eclagent" "thoragent" "hthor" "logging" "tracing" "env" "eclAgentResources" "eclAgentUseChildProcesses" "eclAgentReplicas" "thorAgentReplicas" "eclAgentType" }} +{{- $thorScope := omit .me "eclagent" "thoragent" "hthor" "env" "eclAgentResources" "eclAgentUseChildProcesses" "eclAgentReplicas" "thorAgentReplicas" "eclAgentType" }} {{- $misc := .root.Values.global.misc | default dict }} {{- $postJobCommand := $misc.postJobCommand | default "" }} {{- $eclAgentJobName := printf "%s-job-_HPCC_JOBNAME_" $eclAgentType }}