From 02e4265de0111f1c761807a860676a07d86cdd81 Mon Sep 17 00:00:00 2001
From: everpcpc <everpcpc@users.noreply.github.com>
Date: Thu, 12 Dec 2024 11:09:23 +0800
Subject: [PATCH] fix(meta): remove old config-id arg (#118)

---
 charts/databend-meta/Chart.yaml                |  2 +-
 .../databend-meta/templates/statefulset.yaml   | 18 +++++++++---------
 charts/databend-meta/values.yaml               |  6 ++++++
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/charts/databend-meta/Chart.yaml b/charts/databend-meta/Chart.yaml
index bfff212..bd68424 100644
--- a/charts/databend-meta/Chart.yaml
+++ b/charts/databend-meta/Chart.yaml
@@ -26,7 +26,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.9.6
+version: 0.9.7
 
 # 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-meta/templates/statefulset.yaml b/charts/databend-meta/templates/statefulset.yaml
index 52821d3..2715acd 100644
--- a/charts/databend-meta/templates/statefulset.yaml
+++ b/charts/databend-meta/templates/statefulset.yaml
@@ -59,7 +59,7 @@ spec:
                 case ${BASH_REMATCH[2]} in
                 0)
                   echo "initialize leader node";
-                  exec /databend-meta --id ${ID} --config-id ${ID} \
+                  exec /databend-meta --id ${ID} \
                       --single \
                       --raft-advertise-host "${POD_NAME}.{{ $fullName }}.${POD_NAMESPACE}.svc.cluster.local" \
                       --grpc-api-advertise-host "${POD_NAME}.{{ $fullName }}.${POD_NAMESPACE}.svc.cluster.local" \
@@ -67,7 +67,7 @@ spec:
                   ;;
                 *)
                   echo "initialize follower node";
-                  exec /databend-meta --id ${ID} --config-id ${ID} \
+                  exec /databend-meta --id ${ID} \
                       --join "${NAME}-0.{{ $fullName }}.${POD_NAMESPACE}.svc.cluster.local:28004" \
                       --raft-advertise-host "${POD_NAME}.{{ $fullName }}.${POD_NAMESPACE}.svc.cluster.local" \
                       --grpc-api-advertise-host "${POD_NAME}.{{ $fullName }}.${POD_NAMESPACE}.svc.cluster.local" \
@@ -75,7 +75,7 @@ spec:
                   ;;
                 esac
               {{- else }}
-                exec /databend-meta --id ${ID} --config-id ${ID} \
+                exec /databend-meta --id ${ID} \
                   {{- range $i := until $replicaCount }}
                   --join "${NAME}-{{ $i }}.{{ $fullName }}.${POD_NAMESPACE}.svc.cluster.local:28004" \
                   {{- end }}
@@ -99,18 +99,18 @@ spec:
             httpGet:
               path: /v1/health
               port: admin
-            initialDelaySeconds: {{ default 5 .Values.livenessProbe.initialDelaySeconds }}
-            periodSeconds: {{ default 15 .Values.livenessProbe.initialDelaySeconds }}
-            failureThreshold: {{ default 3 .Values.livenessProbe.initialDelaySeconds }}
+            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+            failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
           {{- end }}
           {{- if .Values.readinessProbe.enabled }}
           readinessProbe:
             httpGet:
               path: /v1/health
               port: admin
-            initialDelaySeconds: {{ default 5 .Values.readinessProbe.initialDelaySeconds }}
-            periodSeconds: {{ default 15 .Values.readinessProbe.initialDelaySeconds }}
-            failureThreshold: {{ default 3 .Values.readinessProbe.initialDelaySeconds }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
           {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
diff --git a/charts/databend-meta/values.yaml b/charts/databend-meta/values.yaml
index f15cfa7..1b7afbd 100644
--- a/charts/databend-meta/values.yaml
+++ b/charts/databend-meta/values.yaml
@@ -35,8 +35,14 @@ serviceAccount:
 
 livenessProbe:
   enabled: true
+  initialDelaySeconds: 5
+  periodSeconds: 15
+  failureThreshold: 3
 readinessProbe:
   enabled: true
+  initialDelaySeconds: 5
+  periodSeconds: 15
+  failureThreshold: 3
 
 service:
   type: ClusterIP