Merge pull request #18141 from jakesmith/HPCC-31016-unique-worker-wor…

…king-dir HPCC-31016 Use unique thorworker working dir in k8s Reviewed-by: Gavin Halliday <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Dec 19, 2023 · 5de6d8e · 5de6d8e
2 parents bcbd1f3 + 32b9fe7
commit 5de6d8e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl
@@ -308,6 +308,9 @@ Add ConfigMap volume mount for a component
   mountPath: /tmp
 - name: {{ .name }}-hpcctmp-volume
   mountPath: /var/lib/HPCCSystems
+{{- if .tmpSubPath }}
+  subPath: {{ .tmpSubPath | quote }}
+{{- end }}
 - name: {{ .name }}-configmap-volume
   mountPath: /etc/config
 {{- end -}}

diff --git a/helm/hpcc/templates/thor.yaml b/helm/hpcc/templates/thor.yaml
@@ -244,7 +244,7 @@ data:
 {{ include "hpcc.mergeEnvironments" $configCtx.me.env | indent 12 }}
             workingDir: /var/lib/HPCCSystems
             volumeMounts:
-{{ include "hpcc.addConfigMapVolumeMount" $configCtx.me | indent 12 }}
+{{ include "hpcc.addConfigMapVolumeMount" (deepCopy $configCtx.me | merge (dict "tmpSubPath" $containerNum)) | indent 12 }}
 {{ include "hpcc.addVolumeMounts" $configCtx | indent 12 }}
 {{ include "hpcc.addSecretVolumeMounts" $configCtx | indent 12 }}
 {{ include "hpcc.addCertificateVolumeMount" (dict "root" $configCtx.root "name" $configCtx.me.name "component" "thorworker") | indent 12 }}