Skip to content

Commit 0b3a8ab

Browse files
Koren PeretzKorenP1
authored andcommitted
Preserve tpl for serversDefinitions
1 parent 013df9e commit 0b3a8ab

File tree

2 files changed

+25
-2
lines changed

2 files changed

+25
-2
lines changed

pkg/helm/templates/_helpers.tpl

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,25 @@
2525
{{- $securityContext = omit $securityContext "appArmorProfile" -}}
2626
{{- end -}}
2727
{{- $securityContext | toYaml -}}
28-
{{- end -}}
28+
{{- end -}}
29+
30+
{{- define "tpl.preserve.variable" -}}
31+
{{- $obj := . }}
32+
{{- if kindIs "map" $obj }}
33+
{{- range $k, $v := $obj }}
34+
{{- if kindIs "string" $v }}
35+
{{- if regexMatch "^[0-9]+$" $v }}
36+
{{- $_ := set $obj $k (atoi $v) }}
37+
{{- else if regexMatch "(?i)^(true|false)$" $v }}
38+
{{- $_ := set $obj $k (eq (lower $v) "true") }}
39+
{{- end }}
40+
{{- else }}
41+
{{- include "tpl.preserve.variable" $v }}
42+
{{- end }}
43+
{{- end }}
44+
{{- else if kindIs "slice" $obj }}
45+
{{- range $i, $v := $obj }}
46+
{{- include "tpl.preserve.variable" $v }}
47+
{{- end }}
48+
{{- end }}
49+
{{- end }}

pkg/helm/templates/configmap-serverDefinitions.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@ metadata:
1010
annotations: {{ . | toYaml | nindent 4 }}
1111
{{- end }}
1212
data:
13-
servers.json: | {{ tpl (dict "Servers" .Values.serverDefinitions.data | toYaml) . | fromYaml | toPrettyJson | nindent 4 }}
13+
{{- $variableToPreserveTPL := tpl (dict "Servers" .Values.serverDefinitions.data | toYaml) . | fromYaml }}
14+
{{- include "tpl.preserve.variable" $variableToPreserveTPL }}
15+
servers.json: | {{ $variableToPreserveTPL | toYaml | nindent 4 }}
1416
{{- end }}

0 commit comments

Comments
 (0)