fix for when settings are null

kit-ar · Sep 5, 2024 · 3dad7d6 · 3dad7d6
1 parent 9c6d3c8
commit 3dad7d6
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/helm/cf-tunnel-v3/templates/deployment.yaml b/helm/cf-tunnel-v3/templates/deployment.yaml
@@ -7,9 +7,9 @@
 {{/* (merge $rootV.x (deepCopy $rootG.x))  -->  $rootG wins   */}}
 {{/* (merge $rootG.x (deepCopy $rootV.x))  -->  $rootV wins   */}}
 {{/* ---------------------------------------------------------------------------------------------------- */}}
-{{- $affinity := (merge $rootV.affinity $rootG.affinity) }}
-{{- $nodeSelector := (merge $rootV.nodeSelector $rootG.nodeSelector) }}
-{{- $tolerations := concat $rootV.tolerations $rootG.tolerations }}
+{{- $affinity     := (merge ($rootV.affinity     |default dict) ($rootG.affinity     |default dict)) }}
+{{- $nodeSelector := (merge ($rootV.nodeSelector |default dict) ($rootG.nodeSelector |default dict)) }}
+{{- $tolerations  := concat ($rootV.tolerations  |default list) ($rootG.tolerations  |default list) }}
 {{/* ---------------------------------------------------------------------------------------------------- */}}
 ---
 # Here we deploy cloudflared images. The tunnel token is stored ina k8s secret