fix: address '--reuse-values' upgrade issue

sysdiglabs · Oct 10, 2024 · 7f0a878 · 7f0a878
1 parent 03a65c5
commit 7f0a878
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/charts/shield/templates/cluster/_helpers.tpl b/charts/shield/templates/cluster/_helpers.tpl
@@ -103,21 +103,21 @@ If release name contains chart name it will be used as a full name.
 {{- end -}}
 
 {{- define "cluster.env" -}}
-{{- $env := concat .Values.env .Values.cluster.env -}}
+{{- $env := concat (default (list) .Values.env) (default (list) .Values.cluster.env) -}}
 {{- with $env -}}
 {{- . | toYaml -}}
 {{- end -}}
 {{- end -}}
 
 {{- define "cluster.volumes" -}}
-{{- $volumes := concat .Values.volumes .Values.cluster.volumes -}}
+{{- $volumes := concat (default (list) .Values.volumes) (default (list) .Values.cluster.volumes) -}}
 {{- with $volumes -}}
 {{- . | toYaml -}}
 {{- end -}}
 {{- end -}}
 
 {{- define "cluster.volume_mounts" -}}
-{{- $volumeMounts := concat .Values.volume_mounts .Values.cluster.volume_mounts -}}
+{{- $volumeMounts := concat (default (list) .Values.volume_mounts) (default (list) .Values.cluster.volume_mounts) -}}
 {{- with $volumeMounts -}}
 {{- . | toYaml -}}
 {{- end -}}

diff --git a/charts/shield/templates/host/_helpers.tpl b/charts/shield/templates/host/_helpers.tpl
@@ -115,21 +115,21 @@ true
 {{- end }}
 
 {{- define "host.env" -}}
-{{- $env := concat .Values.env .Values.host.env -}}
+{{- $env := concat (default (list) .Values.env) (default (list) .Values.host.env) -}}
 {{- with $env -}}
 {{- . | toYaml -}}
 {{- end -}}
 {{- end -}}
 
 {{- define "host.volumes" -}}
-{{- $volumes := concat .Values.volumes .Values.host.volumes -}}
+{{- $volumes := concat (default (list) .Values.volumes) (default (list) .Values.host.volumes) -}}
 {{- with $volumes -}}
 {{- . | toYaml -}}
 {{- end -}}
 {{- end -}}
 
 {{- define "host.volume_mounts" -}}
-{{- $volumeMounts := concat .Values.volume_mounts .Values.host.volume_mounts -}}
+{{- $volumeMounts := concat (default (list) .Values.volume_mounts) (default (list) .Values.host.volume_mounts) -}}
 {{- with $volumeMounts -}}
 {{- . | toYaml -}}
 {{- end -}}