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

tiflash: Add TiFlash security configuration #4412

Merged
merged 14 commits into from
Jan 4, 2021
Merged

tiflash: Add TiFlash security configuration #4412

merged 14 commits into from
Jan 4, 2021

Conversation

JaySon-Huang
Copy link
Contributor

@JaySon-Huang JaySon-Huang commented Dec 15, 2020 •
edited
Loading

Signed-off-by: JaySon-Huang tshent@qq.com

First-time contributors' checklist

What is changed, added or deleted? (Required)

Add document for security configuration in TiFlash.

Which TiDB version(s) do your changes apply to? (Required)

  • master (the latest development version)
  • v4.0 (TiDB 4.0 versions)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 versions)

What is the related PR or file link(s)?

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

@JaySon-Huang
Add configuration
0785785 
Signed-off-by: JaySon-Huang <tshent@qq.com>
@JaySon-Huang
Copy link
Contributor Author

@flowbehappy

@JaySon-Huang JaySon-Huang mentioned this pull request Dec 15, 2020
Closed
7 tasks
@TomShawn TomShawn requested a review from flowbehappy December 15, 2020 11:17
@TomShawn TomShawn added size/small Changes of a small size. status/PTAL This PR is ready for reviewing. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. labels Dec 15, 2020
@JaySon-Huang JaySon-Huang changed the title Add TiFlash security configuration tiflash: Add TiFlash security configuration Dec 17, 2020
@TomShawn TomShawn added status/require-change Needs the author to address comments. and removed status/PTAL This PR is ready for reviewing. labels Dec 18, 2020
JaySon-Huang and others added 2 commits December 18, 2020 03:24
@JaySon-Huang @flowbehappy
Apply suggestions from code review
2b5d30e 
Co-authored-by: Flowyi <flowbehappy@gmail.com>
@JaySon-Huang
Fix another doc
e02d8a0 
Signed-off-by: JaySon-Huang <tshent@qq.com>
@ti-srebot
Copy link
Contributor

@JaySon-Huang, please update your pull request.

@ti-srebot
Copy link
Contributor

@flowbehappy, PTAL.

@TomShawn
Copy link
Contributor

@JaySon-Huang Please resolve the conflict, thanks~

TomShawn
TomShawn reviewed Dec 22, 2020
View reviewed changes
enable-tls-between-components.md Outdated
@@ -49,9 +49,12 @@ Currently, it is not supported to only enable encrypted transmission of some spe

```toml
[security]
# set the path for certificates. Empty string means disabling secure connections.
## The path for certificates. Empty string means that secure connections are disabled.
# Path of the file that contains list of trusted SSL CAs. If set, the following settings `cert_path` and `key_path` are also needed.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lysu PTAL the description changes in this file, thanks~

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM for those description

@ti-srebot
Copy link
Contributor

@JaySon-Huang, please update your pull request.

1 similar comment
@ti-srebot
Copy link
Contributor

@JaySon-Huang, please update your pull request.

@ti-srebot
Copy link
Contributor

@JaySon-Huang, please update your pull request.

@ti-srebot
Copy link
Contributor

No updates for a long time, close PR.

@JaySon-Huang
Copy link
Contributor Author

@TomShawn Can we merge this PR?

TomShawn
TomShawn reviewed Jan 4, 2021
View reviewed changes
enable-tls-between-components.md Outdated Show resolved Hide resolved
enable-tls-between-components.md Outdated Show resolved Hide resolved
enable-tls-between-components.md Outdated Show resolved Hide resolved
enable-tls-between-components.md Outdated Show resolved Hide resolved
TomShawn
TomShawn approved these changes Jan 4, 2021
View reviewed changes
Copy link
Contributor

@TomShawn TomShawn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 4, 2021
@TomShawn TomShawn added requires-followup This PR requires a follow-up task after being merged. and removed status/require-change Needs the author to address comments. labels Jan 4, 2021
@TomShawn
Copy link
Contributor

TomShawn commented Jan 4, 2021 •
edited
Loading

Follow-Up: align the description changes in enable-tls-between-components.md to docs-cn.

@TomShawn TomShawn merged commit f9e7086 into pingcap:master Jan 4, 2021
ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Jan 4, 2021
@JaySon-Huang @ti-srebot
cherry pick pingcap#4412 to release-4.0
8295ba5 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jan 4, 2021
Merged
10 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #4570

ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Jan 4, 2021
@JaySon-Huang @ti-srebot
cherry pick pingcap#4412 to release-5.0
f9e6147 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jan 4, 2021
Merged
10 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #4571

TomShawn pushed a commit that referenced this pull request Jan 4, 2021
@ti-srebot @JaySon-Huang
tiflash: Add TiFlash security configuration (#4412) (#4570)
98e3a23 
* cherry pick #4412 to release-4.0

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

* Remove redact_info_log

Co-authored-by: JaySon <tshent@qq.com>
Co-authored-by: JaySon <jayson.hjs@gmail.com>
TomShawn pushed a commit that referenced this pull request Jan 4, 2021
@ti-srebot @JaySon-Huang
cherry pick #4412 to release-5.0 (#4571)
4fb1e97 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: JaySon <tshent@qq.com>
@JaySon-Huang JaySon-Huang deleted the tiflash_redact branch March 9, 2021 07:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TomShawn TomShawn TomShawn approved these changes

@flowbehappy flowbehappy flowbehappy left review comments

@lysu lysu Awaiting requested review from lysu

Assignees
No one assigned
Labels
requires-followup This PR requires a follow-up task after being merged. size/small Changes of a small size. status/LGT1 Indicates that a PR has LGTM 1. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@JaySon-Huang @ti-srebot @TomShawn @lysu @flowbehappy