Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 14 commits into from
Jul 17, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d8deb74
change the way to config tidb/tikv/pd in charts
DanielZhangQD Jul 5, 2019
6249a92
Merge branch 'master' into config-change
DanielZhangQD Jul 8, 2019
21446ce
update config for aws
DanielZhangQD Jul 8, 2019
9a447af
remove template config
DanielZhangQD Jul 9, 2019
e1ffde3
Merge branch 'master' into config-change
DanielZhangQD Jul 11, 2019
88d8e9c
remove unnecessary default configs
DanielZhangQD Jul 11, 2019
3dd6f18
Merge branch 'master' into config-change
xiaojingchen Jul 15, 2019
0927f84
fix e2e and stability error when configuration way changed
xiaojingchen Jul 15, 2019
c711917
fix lint error
xiaojingchen Jul 15, 2019
3aeba24
remove tab
xiaojingchen Jul 15, 2019
5ae70f0
fix bug
xiaojingchen Jul 16, 2019
0940822
fix bug
xiaojingchen Jul 16, 2019
dee0283
remove blank lines
xiaojingchen Jul 17, 2019
be6387f
Merge branch 'master' into DanielZhangQD/config-change
xiaojingchen Jul 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions charts/tidb-cluster/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}

Expand All @@ -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 -}}

Expand All @@ -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 -}}

Expand Down
95 changes: 0 additions & 95 deletions charts/tidb-cluster/templates/config/_pd-config.tpl
View file
Open in desktop

This file was deleted.

271 changes: 0 additions & 271 deletions charts/tidb-cluster/templates/config/_tidb-config.tpl
View file
Open in desktop

This file was deleted.

Loading