From 06d7634320f1a772cd14d8a6990c7665010d22c4 Mon Sep 17 00:00:00 2001
From: Doug Goldstein <cardoe@cardoe.com>
Date: Tue, 8 Apr 2025 08:27:40 -0500
Subject: [PATCH] helm-toolkit: include mounts in the bootstrap job

Respect the mounts defined by each service and mount them into the
bootstrap job.

Change-Id: Ic169e00208b7ca22a998ad8e2659cd42c49b5339
---
 helm-toolkit/templates/manifests/_job-bootstrap.tpl   | 5 +++--
 releasenotes/notes/helm-toolkit-fa49be61648b2d72.yaml | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/helm-toolkit-fa49be61648b2d72.yaml

diff --git a/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/helm-toolkit/templates/manifests/_job-bootstrap.tpl
index 6b77004f0d..cefd4e8590 100644
--- a/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+++ b/helm-toolkit/templates/manifests/_job-bootstrap.tpl
@@ -20,12 +20,13 @@ limitations under the License.
 {{- define "helm-toolkit.manifests.job_bootstrap" -}}
 {{- $envAll := index . "envAll" -}}
 {{- $serviceName := index . "serviceName" -}}
+{{- $jobNameRef := printf "%s_%s" $serviceName "bootstrap" -}}
 {{- $jobAnnotations := index . "jobAnnotations" -}}
 {{- $jobLabels := index . "jobLabels" -}}
 {{- $nodeSelector := index . "nodeSelector" | default ( dict $envAll.Values.labels.job.node_selector_key $envAll.Values.labels.job.node_selector_value ) -}}
 {{- $tolerationsEnabled := index . "tolerationsEnabled" | default false -}}
-{{- $podVolMounts := index . "podVolMounts" | default false -}}
-{{- $podVols := index . "podVols" | default false -}}
+{{- $podVolMounts := index . "podVolMounts" | default (dig $jobNameRef $jobNameRef "volumeMounts" false $envAll.Values.pod.mounts) -}}
+{{- $podVols := index . "podVols" | default (dig $jobNameRef $jobNameRef "volumes" false $envAll.Values.pod.mounts) -}}
 {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}}
 {{- $configMapEtc := index . "configMapEtc" | default (printf "%s-%s" $serviceName "etc" ) -}}
 {{- $configFile := index . "configFile" | default (printf "/etc/%s/%s.conf" $serviceName $serviceName ) -}}
diff --git a/releasenotes/notes/helm-toolkit-fa49be61648b2d72.yaml b/releasenotes/notes/helm-toolkit-fa49be61648b2d72.yaml
new file mode 100644
index 0000000000..3296bfeeaa
--- /dev/null
+++ b/releasenotes/notes/helm-toolkit-fa49be61648b2d72.yaml
@@ -0,0 +1,5 @@
+---
+helm-toolkit:
+  - |
+    Mount volumes requested into the job's pod.
+...