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

tidb-configuration-file: add tls-version #7899

Merged
merged 4 commits into from
Apr 8, 2022
Merged

tidb-configuration-file: add tls-version #7899

merged 4 commits into from
Apr 8, 2022

Conversation

dveeden
Copy link
Contributor

@dveeden dveeden commented Mar 22, 2022

What is changed, added or deleted? (Required)

Add docs for the tls-version configuration in the TiDB configuration.

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

  • master (the latest development version)
  • v6.0 (TiDB 6.0 versions)
  • v5.4 (TiDB 5.4 versions)
  • v5.3 (TiDB 5.3 versions)
  • v5.2 (TiDB 5.2 versions)
  • v5.1 (TiDB 5.1 versions)
  • v5.0 (TiDB 5.0 versions)
  • 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

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 22, 2022 •
edited

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • SunRunAway
  • shichun-0415

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added missing-translation-status This PR does not have translation status info. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 22, 2022
@dveeden dveeden requested review from SunRunAway, bb7133 and qiancai and removed request for TomShawn March 22, 2022 09:15
@dveeden
Copy link
Contributor Author

dveeden commented Mar 22, 2022 •
edited

Note that there are multiple things that influence the TLS versions that can be used:

@SunRunAway
Copy link
Contributor

I suggest we also add a hint in this doc https://docs.pingcap.com/tidb/stable/enable-tls-between-clients-and-servers for this configuration and its default value. @dveeden

@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 22, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 22, 2022
bb7133
bb7133 approved these changes Mar 23, 2022
View reviewed changes
Copy link
Member

@bb7133 bb7133 left a comment

Choose a reason for hiding this comment

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

LGTM

@shichun-0415 shichun-0415 added translation/doing This PR's assignee is translating this PR. area/security Relates to TiDB security and privilege. type/compatibility-or-feature-change This PR involves compatibility changes or feature behavior changes. needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. and removed missing-translation-status This PR does not have translation status info. labels Mar 24, 2022
@ti-chi-bot ti-chi-bot removed the status/LGT1 Indicates that a PR has LGTM 1. label Apr 8, 2022
@ti-chi-bot ti-chi-bot added the status/LGT2 Indicates that a PR has LGTM 2. label Apr 8, 2022
@shichun-0415 shichun-0415 self-assigned this Apr 8, 2022
@shichun-0415
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: de29d00

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 8, 2022
@ti-chi-bot ti-chi-bot merged commit f1e97a6 into pingcap:master Apr 8, 2022
ti-chi-bot pushed a commit to ti-chi-bot/docs that referenced this pull request Apr 8, 2022
@dveeden @ti-chi-bot
This is an automated cherry-pick of pingcap#7899
388f6c0 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Apr 8, 2022
Merged
15 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #8138.

@ti-chi-bot ti-chi-bot mentioned this pull request Apr 8, 2022
Merged
15 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #8139.

@ti-chi-bot ti-chi-bot mentioned this pull request Apr 8, 2022
Merged
15 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #8140.

shichun-0415 added a commit that referenced this pull request Apr 8, 2022
@ti-chi-bot @dveeden @shichun-0415
tidb-configuration-file: add tls-version (#7899) (#8140)
6da7c92 
* tidb-configuration-file: add tls-version

* enable-tls-between-clients-and-servers: add references to tls-version

* Add possible values for tls-version

* fix jenkins

Co-authored-by: Daniël van Eeden <git@myname.nl>
Co-authored-by: shichun-0415 <89768198+shichun-0415@users.noreply.github.com>
shichun-0415 added a commit that referenced this pull request Apr 8, 2022
@ti-chi-bot @dveeden @shichun-0415
tidb-configuration-file: add tls-version (#7899) (#8139)
2c7f41c 
* tidb-configuration-file: add tls-version

* enable-tls-between-clients-and-servers: add references to tls-version

* Add possible values for tls-version

* fix jenkins

Co-authored-by: Daniël van Eeden <git@myname.nl>
Co-authored-by: shichun-0415 <89768198+shichun-0415@users.noreply.github.com>
shichun-0415 pushed a commit that referenced this pull request Apr 8, 2022
@ti-chi-bot @dveeden
tidb-configuration-file: add tls-version (#7899) (#8138)
d00af46 
* This is an automated cherry-pick of #7899

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

* Fix merge conflict

Co-authored-by: Daniël van Eeden <git@myname.nl>
@shichun-0415 shichun-0415 mentioned this pull request May 6, 2022
Merged
14 tasks
@shichun-0415 shichun-0415 added translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. and removed translation/doing This PR's assignee is translating this PR. labels May 6, 2022
TomShawn
TomShawn reviewed May 10, 2022
View reviewed changes
enable-tls-between-clients-and-servers.md

The `tls-version` configuration option can be used to limit the TLS versions that can be used.

The actual TLS versions that can be used depend on the OS crypto policy, MySQL client version and the SSL/TLS libary that is used by the client.
Copy link
Contributor

Choose a reason for hiding this comment

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

libary -> library

@shichun-0415 shichun-0415 mentioned this pull request May 10, 2022
Merged
17 tasks
This was referenced May 10, 2022
Merged
Merged
Merged
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TomShawn TomShawn TomShawn left review comments

@SunRunAway SunRunAway SunRunAway approved these changes

@bb7133 bb7133 bb7133 approved these changes

@shichun-0415 shichun-0415 shichun-0415 approved these changes

@qiancai qiancai Awaiting requested review from qiancai

Assignees

@shichun-0415 shichun-0415

Labels
area/security Relates to TiDB security and privilege. needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. type/compatibility-or-feature-change This PR involves compatibility changes or feature behavior changes.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@dveeden @ti-chi-bot @SunRunAway @shichun-0415 @bb7133 @TomShawn