adding support for global configs (easier to use in composite charts)

kit-ar · Sep 5, 2024 · e6be13c · e6be13c
1 parent 7fda56f
commit e6be13c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/helm/cf-tunnel-v3/Chart.yaml b/helm/cf-tunnel-v3/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # "2.0101.230402" -> "v2.1.1" of the chart, referring to "2023.4.2" of the tunnel
 # The reason for this is to make the current chart update with the bump when deployed via HelmRelease
 #
-version: "3.1007.24090502"
+version: "3.1007.24090503"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/helm/cf-tunnel-v3/templates/deployment.yaml b/helm/cf-tunnel-v3/templates/deployment.yaml
@@ -1,3 +1,17 @@
+{{/* https://masterminds.github.io/sprig/ */}}
+{{/* ---------------------------------------------------------------------------------------------------- */}}
+{{- $root := . }}
+{{- $rootV := $root.Values }}
+{{- $rootG := $rootV.global }}
+{{/* ---------------------------------------------------------------------------------------------------- */}}
+{{/* (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 }}
+{{/* ---------------------------------------------------------------------------------------------------- */}}
+---
 # Here we deploy cloudflared images. The tunnel token is stored ina k8s secret
 apiVersion: apps/v1
 kind: Deployment
@@ -147,14 +161,14 @@ spec:
             secretName: {{ .Values.cloudflare.existingSecretCred }}
         {{- end }}
 
-      {{- with .Values.nodeSelector }}
+      {{- with $nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- if .Values.replicaCount }}
       {{- if gt (int .Values.replicaCount) 1 }}
       affinity:
-        {{- with .Values.affinity }}
+        {{- with $affinity }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
         {{- if .Values.affinity_keep_podAntiAffinity }}
@@ -174,7 +188,7 @@ spec:
         {{- end }}
       {{- end }}
       {{- end }}
-      {{- with .Values.tolerations }}
+      {{- with $tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}