Skip to content

Commit 7053cd4

Browse files
committed
feat: filterEmptyFields
1 parent 6b0f5f5 commit 7053cd4

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

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

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

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ spec:
1818
{{- toYaml .Values.nginx.pod | nindent 8 }}
1919
{{- end }}
2020
container:
21-
{{- if .Values.nginx.container }}
22-
{{- toYaml .Values.nginx.container | nindent 8 }}
21+
{{- if .Values.nginx.container }}
22+
{{- with .Values.nginx.container }}
23+
{{- include "filterEmptyFields" . | nindent 8 }}
2324
{{- end }}
25+
{{- end }}
2426
image:
2527
{{- toYaml .Values.nginx.image | nindent 10 }}
2628
{{- if .Values.nginx.debug }}
@@ -34,9 +36,11 @@ spec:
3436
{{- toYaml .Values.nginx.pod | nindent 8 }}
3537
{{- end }}
3638
container:
37-
{{- if .Values.nginx.container }}
38-
{{- toYaml .Values.nginx.container | nindent 8 }}
39+
{{- if .Values.nginx.container }}
40+
{{- with .Values.nginx.container }}
41+
{{- include "filterEmptyFields" . | nindent 8 }}
3942
{{- end }}
43+
{{- end }}
4044
image:
4145
{{- toYaml .Values.nginx.image | nindent 10 }}
4246
{{- if .Values.nginx.debug }}

0 commit comments

Comments
 (0)