Add missing template definition for extraUsers (#60)

* Add missing template definition for extraUsers

* fix files block in chi.yaml

Author: fkywong

charts/clickhouse/templates/_helpers.tpl

@@ -203,6 +203,15 @@ Extra Config
   {{- end -}}
 {{- end -}}
 {{/*
+Extra Users
+*/}}
+{{- define "clickhouse.extraUsers" -}}
+  {{- if not (empty .Values.clickhouse.extraUsers) -}}
+    {{ .Values.clickhouse.extraUsers }}
+  {{- else -}}
+  {{- end -}}
+{{- end -}}
+{{/*
 Common labels
 */}}
 {{- define "clickhouse.labels" -}}

charts/clickhouse/templates/chi.yaml

@@ -190,16 +190,17 @@ spec:
             port: {{ .Values.clickhouse.keeper.port }}
     {{- end }}
     {{- $extraConfig := tpl (include "clickhouse.extraConfig" . ) . -}}
-    {{- if not (empty $extraConfig) }}
+    {{- $extraUsers := tpl (include "clickhouse.extraUsers" . ) . -}}
+    {{- if not (and (empty $extraConfig) (empty $extraUsers)) }}
     files:
+        {{- if not (empty $extraConfig) }}
         config.d/extra_config.xml: |
           {{- tpl $extraConfig . | nindent 10 }}
-    {{- end }}
-    {{- $extraUsers := tpl (include "clickhouse.extraUsers" . ) . -}}
-    {{- if not (empty $extraUsers) }}
-    files:
+        {{- end }}
+        {{- if not (empty $extraUsers) }}
         users.d/extra_users.xml: |
           {{- tpl $extraUsers . | nindent 10 }}
+        {{- end }}
     {{- end }}
 
 {{ include "validate.clickhouse.keeper" . }}