Merge remote-tracking branch 'origin/main' into tune-comments

databendlabs · Aug 6, 2024 · bbedaf6 · bbedaf6
2 parents 8634c2e + 939e5b8
commit bbedaf6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/charts/databend-query/Chart.yaml b/charts/databend-query/Chart.yaml
@@ -25,7 +25,7 @@ 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.10.3
+version: 0.10.4
 
 # 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

diff --git a/charts/databend-query/templates/ingress.yaml b/charts/databend-query/templates/ingress.yaml
@@ -6,6 +6,9 @@
   {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
   {{- end }}
 {{- end }}
+{{- if .Values.enableLoadBalance }}
+  {{- $_ := set .Values.ingress.annotations "nginx.ingress.kubernetes.io/upstream-hash-by" "$http_x_databend_route_hint" }}
+{{- end }}
 {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1
 {{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}

diff --git a/charts/databend-query/templates/service.yaml b/charts/databend-query/templates/service.yaml
@@ -19,7 +19,7 @@ spec:
     {{- end }}
   selector:
     {{- include "databend-query.selectorLabels" . | nindent 4 }}
-    {{- if eq (lower .Values.workload) "statefulset" }}
+    {{- if and (eq .Values.workload "statefulset") (not .Values.enableLoadBalance) }}
     statefulset.kubernetes.io/pod-name: {{ include "databend-query.fullname" . }}-0
     {{- end }}
   {{- with .Values.service.sessionAffinity }}