fix(meta): check bootstrap with replicaCount (#54)

databendlabs · Mar 6, 2023 · 0e07751 · 0e07751
1 parent dd185cd
commit 0e07751
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/charts/databend-meta/Chart.yaml b/charts/databend-meta/Chart.yaml
@@ -21,13 +21,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.5.6
+version: 0.6.0
 
 # 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: "v0.9.57-nightly"
+appVersion: "v1.0.3-nightly"
 
 dependencies:
 - name: common

diff --git a/charts/databend-meta/templates/statefulset.yaml b/charts/databend-meta/templates/statefulset.yaml
@@ -1,4 +1,6 @@
 {{- $fullName := include "databend-meta.fullname" . }}
+{{- $replicaCount := int .Values.replicaCount }}
+{{- $bootstrap := or .Values.bootstrap (eq $replicaCount 1) }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -8,7 +10,7 @@ metadata:
 spec:
   serviceName: {{ $fullName }}
   replicas: {{ .Values.replicaCount }}
-  {{- if .Values.bootstrap }}
+  {{- if $bootstrap }}
   podManagementPolicy: OrderedReady
   {{- else }}
   podManagementPolicy: Parallel
@@ -51,7 +53,7 @@ spec:
                 NAME=${BASH_REMATCH[1]}
                 ID=${BASH_REMATCH[2]}
                 echo "ID: $ID" "NAME : $NAME"
-            {{- if .Values.bootstrap }}
+            {{- if $bootstrap }}
                 case ${BASH_REMATCH[2]} in
                   0)
                     echo "initialize leader node";
@@ -104,7 +106,7 @@ spec:
                   --raft-listen-host ${POD_IP} \
                   --raft-advertise-host ${POD_NAME}.{{ $fullName }}.${POD_NAMESPACE}.svc.cluster.local \
                   --grpc-api-advertise-host ${POD_IP} \
-            {{- range $i := until (int .Values.replicaCount) }}
+            {{- range $i := until $replicaCount }}
                   --join ${NAME}-{{ $i }}.{{ $fullName }}.${POD_NAMESPACE}.svc.cluster.local:28004 \
             {{- end }}
                   --config-id ${ID}

diff --git a/charts/databend-query/Chart.yaml b/charts/databend-query/Chart.yaml
@@ -20,13 +20,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.4.3
+version: 0.5.0
 
 # 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: "v0.9.57-nightly"
+appVersion: "v1.0.3-nightly"
 
 dependencies:
 - name: minio