From ac609c0308fc2c02c2576b85ca27bfc028226d50 Mon Sep 17 00:00:00 2001
From: everpcpc <everpcpc@users.noreply.github.com>
Date: Sun, 7 May 2023 09:21:55 +0800
Subject: [PATCH] fix(query): extra config before query.users (#71)

---
 charts/databend-query/Chart.yaml               |  4 ++--
 charts/databend-query/templates/configmap.yaml | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/charts/databend-query/Chart.yaml b/charts/databend-query/Chart.yaml
index 61289e5..42abe13 100644
--- a/charts/databend-query/Chart.yaml
+++ b/charts/databend-query/Chart.yaml
@@ -25,13 +25,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.6.0
+version: 0.6.1
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v1.1.14-nightly"
+appVersion: "v1.1.26-nightly"
 
 dependencies:
 - name: minio
diff --git a/charts/databend-query/templates/configmap.yaml b/charts/databend-query/templates/configmap.yaml
index f364c89..43f8d4a 100644
--- a/charts/databend-query/templates/configmap.yaml
+++ b/charts/databend-query/templates/configmap.yaml
@@ -21,6 +21,14 @@ data:
       max_server_memory_usage = {{ .Values.config.query.maxServerMemoryUsage | default 0 }}
       max_memory_limit_enabled = {{ .Values.config.query.maxMemoryLimitEnabled | default false }}
 
+      {{- range $field, $value := .Values.config.query.extra }}
+      {{- if (kindIs "string" $value) }}
+      {{ $field }} = {{ $value | quote }}
+      {{- else }}
+      {{ $field }} = {{ $value }}
+      {{- end }}
+      {{- end }}
+
       {{- range .Values.config.query.users }}
       [[query.users]]
         name = {{ .name | quote }}
@@ -32,14 +40,6 @@ data:
         {{- end }}
       {{- end }}
 
-      {{- range $field, $value := .Values.config.query.extra }}
-      {{- if (kindIs "string" $value) }}
-      {{ $field }} = {{ $value | quote }}
-      {{- else }}
-      {{ $field }} = {{ $value }}
-      {{- end }}
-      {{- end }}
-
     [log]
       [log.file]
         on = {{ .Values.config.log.file.enabled }}