change the way to config tidb/tikv/pd in charts (#638)

(cherry picked from commit 9252057)
pingcap · Jul 29, 2019 · 22ac6ed · 22ac6ed
1 parent c4ccbc4
commit 22ac6ed
Show file tree

Hide file tree

Showing 12 changed files with 183 additions and 1,056 deletions.
diff --git a/charts/tidb-cluster/templates/_helpers.tpl b/charts/tidb-cluster/templates/_helpers.tpl
@@ -36,8 +36,6 @@ startup-script: |-
 config-file: |-
     {{- if .Values.pd.config }}
 {{ .Values.pd.config | indent 2 }}
-    {{- else }}
-{{ tuple "config/_pd-config.tpl" . | include "helm-toolkit.utils.template" | indent 2 }}
     {{- end -}}
 {{- end -}}
 
@@ -54,8 +52,6 @@ startup-script: |-
 config-file: |-
     {{- if .Values.tikv.config }}
 {{ .Values.tikv.config | indent 2 }}
-    {{- else }}
-{{ tuple "config/_tikv-config.tpl" . | include "helm-toolkit.utils.template" | indent 2 }}
     {{- end -}}
 {{- end -}}
 
@@ -76,8 +72,6 @@ init-sql: |-
 config-file: |-
     {{- if .Values.tidb.config }}
 {{ .Values.tidb.config | indent 2 }}
-    {{- else }}
-{{ tuple "config/_tidb-config.tpl" . | include "helm-toolkit.utils.template" | indent 2 }}
     {{- end -}}
 {{- end -}}
 

diff --git a/charts/tidb-cluster/templates/config/_pd-config.tpl b/charts/tidb-cluster/templates/config/_pd-config.tpl
diff --git a/charts/tidb-cluster/templates/config/_tidb-config.tpl b/charts/tidb-cluster/templates/config/_tidb-config.tpl