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

support passing raw toml config for tiflash #3355

Merged
merged 9 commits into from Oct 14, 2020
Merged

support passing raw toml config for tiflash #3355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5416168
Support pass raw toml config for tiflash
july2993 Oct 10, 2020
ae21405
Add not-expect type validation
july2993 Oct 12, 2020
4572e15
Merge branch 'master' into toml_config_flash
july2993 Oct 12, 2020
1d8257d
simplify validata
july2993 Oct 12, 2020
dff61e7
Align code style about update map
july2993 Oct 12, 2020
11716e3
remove literal
july2993 Oct 13, 2020
ba9b8ef
Merge branch 'master' into toml_config_flash
july2993 Oct 13, 2020
a46492a
fix path
july2993 Oct 13, 2020
74cc4f9
Merge branch 'master' into toml_config_flash
DanielZhangQD Oct 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
99 changes: 95 additions & 4 deletions docs/api-references/docs.md
View file
Open in desktop
Expand Up @@ -12757,12 +12757,35 @@ kubectl create secret generic <clusterName>-tidb-client-secret &ndash;namespace=
</tr>
</tbody>
</table>
<h3 id="tiflashconfig">TiFlashConfig</h3>
<h3 id="tiflashcommonconfigwraper">TiFlashCommonConfigWraper</h3>
<p>
(<em>Appears on:</em>
<a href="#tiflashspec">TiFlashSpec</a>)
<a href="#tiflashconfigwraper">TiFlashConfigWraper</a>)
</p>
<p>
</p>
<table>
<thead>
<tr>
<th>Field</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<code>GenericConfig</code></br>
<em>
github.com/pingcap/tidb-operator/pkg/util/config.GenericConfig
</em>
</td>
<td>
</td>
</tr>
</tbody>
</table>
<h3 id="tiflashconfig">TiFlashConfig</h3>
<p>
<p>TiFlashConfig is the configuration of TiFlash.</p>
</p>
<table>
Expand Down Expand Up @@ -12803,6 +12826,74 @@ ProxyConfig
</tr>
</tbody>
</table>
<h3 id="tiflashconfigwraper">TiFlashConfigWraper</h3>
<p>
(<em>Appears on:</em>
<a href="#tiflashspec">TiFlashSpec</a>)
</p>
<p>
</p>
<table>
<thead>
<tr>
<th>Field</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<code>config</code></br>
<em>
<a href="#tiflashcommonconfigwraper">
TiFlashCommonConfigWraper
</a>
</em>
</td>
<td>
</td>
</tr>
<tr>
<td>
<code>proxy</code></br>
<em>
<a href="#tiflashproxyconfigwraper">
TiFlashProxyConfigWraper
</a>
</em>
</td>
<td>
</td>
</tr>
</tbody>
</table>
<h3 id="tiflashproxyconfigwraper">TiFlashProxyConfigWraper</h3>
<p>
(<em>Appears on:</em>
<a href="#tiflashconfigwraper">TiFlashConfigWraper</a>)
</p>
<p>
</p>
<table>
<thead>
<tr>
<th>Field</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<code>GenericConfig</code></br>
<em>
github.com/pingcap/tidb-operator/pkg/util/config.GenericConfig
</em>
</td>
<td>
</td>
</tr>
</tbody>
</table>
<h3 id="tiflashspec">TiFlashSpec</h3>
<p>
(<em>Appears on:</em>
Expand Down Expand Up @@ -12928,8 +13019,8 @@ TiFlash supports multiple disks.</p>
<td>
<code>config</code></br>
<em>
<a href="#tiflashconfig">
TiFlashConfig
<a href="#tiflashconfigwraper">
TiFlashConfigWraper
</a>
</em>
</td>
Expand Down
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Expand Up @@ -93,6 +93,7 @@ require (
k8s.io/utils v0.0.0-20190801114015-581e00157fb1
sigs.k8s.io/apiserver-builder-alpha/cmd v0.0.0-20191113095113-4493943d2568
sigs.k8s.io/controller-runtime v0.4.0
sigs.k8s.io/yaml v1.1.0
)

replace github.com/renstrom/dedent => github.com/lithammer/dedent v1.1.0
Expand Down