From 19df91fe761dadce4728f2b9a8352f5b2990c16d Mon Sep 17 00:00:00 2001
From: Adam Roberts <adam.roberts@sysdig.com>
Date: Thu, 10 Oct 2024 13:53:15 -0400
Subject: [PATCH] fix: address '--reuse-values' upgrade issue

---
 charts/shield/templates/cluster/_helpers.tpl | 6 ++++++
 charts/shield/templates/host/_helpers.tpl    | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/charts/shield/templates/cluster/_helpers.tpl b/charts/shield/templates/cluster/_helpers.tpl
index 84b4ce36e..8ede1d174 100644
--- a/charts/shield/templates/cluster/_helpers.tpl
+++ b/charts/shield/templates/cluster/_helpers.tpl
@@ -103,22 +103,28 @@ If release name contains chart name it will be used as a full name.
 {{- end -}}
 
 {{- define "cluster.env" -}}
+{{- if and .Values.env .Values.cluster.env -}}
 {{- $env := concat .Values.env .Values.cluster.env -}}
 {{- with $env -}}
 {{- . | toYaml -}}
 {{- end -}}
 {{- end -}}
+{{- end -}}
 
 {{- define "cluster.volumes" -}}
+{{- if and .Values.volumes .Values.cluster.volumes -}}
 {{- $volumes := concat .Values.volumes .Values.cluster.volumes -}}
 {{- with $volumes -}}
 {{- . | toYaml -}}
 {{- end -}}
 {{- end -}}
+{{- end -}}
 
 {{- define "cluster.volume_mounts" -}}
+{{- if and .Values.volume_mounts .Values.cluster.volume_mounts -}}
 {{- $volumeMounts := concat .Values.volume_mounts .Values.cluster.volume_mounts -}}
 {{- with $volumeMounts -}}
 {{- . | toYaml -}}
 {{- end -}}
 {{- end -}}
+{{- end -}}
diff --git a/charts/shield/templates/host/_helpers.tpl b/charts/shield/templates/host/_helpers.tpl
index 146117b89..a4132ecba 100644
--- a/charts/shield/templates/host/_helpers.tpl
+++ b/charts/shield/templates/host/_helpers.tpl
@@ -115,22 +115,28 @@ true
 {{- end }}
 
 {{- define "host.env" -}}
+{{- if and .Values.env .Values.host.env -}}
 {{- $env := concat .Values.env .Values.host.env -}}
 {{- with $env -}}
 {{- . | toYaml -}}
 {{- end -}}
 {{- end -}}
+{{- end -}}
 
 {{- define "host.volumes" -}}
+{{- if and .Values.volumes .Values.host.volumes -}}
 {{- $volumes := concat .Values.volumes .Values.host.volumes -}}
 {{- with $volumes -}}
 {{- . | toYaml -}}
 {{- end -}}
 {{- end -}}
+{{- end -}}
 
 {{- define "host.volume_mounts" -}}
+{{- if and .Values.volume_mounts .Values.host.volume_mounts -}}
 {{- $volumeMounts := concat .Values.volume_mounts .Values.host.volume_mounts -}}
 {{- with $volumeMounts -}}
 {{- . | toYaml -}}
 {{- end -}}
 {{- end -}}
+{{- end -}}