Skip to content

Commit f959180

Browse files
committed
feat: filterEmptyFields
1 parent 4a294ad commit f959180

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

charts/nginx-gateway-fabric/templates/_helpers.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Filters out empty fields from a struct.
102102
{{- $result = merge $result (dict $key $value) }}
103103
{{- end }}
104104
{{- end }}
105-
{{- if $result }}
106-
{{- $result | toYaml }}
107-
{{- end }}
105+
{{- if $result -}}
106+
{{- $result | toYaml -}}
107+
{{- end -}}
108108
{{- end }}

charts/nginx-gateway-fabric/templates/nginxproxy.yaml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ spec:
1919
{{- end }}
2020
container:
2121
{{- with .Values.nginx.container }}
22-
{{- include "filterEmptyFields" . | nindent 8 }}
22+
{{- $filtered := include "filterEmptyFields" . }}
23+
{{- if $filtered }}
24+
{{- $filtered | nindent 8 }}
25+
{{- end }}
2326
{{- end }}
2427
image:
2528
{{- toYaml .Values.nginx.image | nindent 10 }}
@@ -35,7 +38,10 @@ spec:
3538
{{- end }}
3639
container:
3740
{{- with .Values.nginx.container }}
38-
{{- include "filterEmptyFields" . | nindent 8 }}
41+
{{- $filtered := include "filterEmptyFields" . }}
42+
{{- if $filtered }}
43+
{{- $filtered | nindent 8 }}
44+
{{- end }}
3945
{{- end }}
4046
image:
4147
{{- toYaml .Values.nginx.image | nindent 10 }}
@@ -46,6 +52,9 @@ spec:
4652
{{- if .Values.nginx.service }}
4753
service:
4854
{{- with .Values.nginx.service }}
49-
{{- include "filterEmptyFields" . | nindent 6 }}
55+
{{- $filtered := include "filterEmptyFields" . }}
56+
{{- if $filtered }}
57+
{{- $filtered | nindent 6 }}
58+
{{- end }}
5059
{{- end }}
5160
{{- end }}

0 commit comments

Comments
 (0)