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.

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

Skip the TLS of the PD dashboard when the TiDB version < v4.0.0 #2389

Merged
merged 12 commits into from
May 8, 2020

Conversation

weekface
Copy link
Contributor

@weekface weekface commented May 7, 2020

What problem does this PR solve?

fixes: #2385

What is changed and how does it work?

Check List

Tests

  • Unit test
    Code changes

  • Has Go code change

Side effects

Related changes

  • Need to cherry-pick to the release branch

Does this PR introduce a user-facing change?:

Skip the TLS of the PD dashboard when the TiDB version < v4.0.0

Comment on lines 58 to 65
func (tc *TidbCluster) PDVersion() string {
version := tc.Spec.PD.Version
if version == nil {
version = &tc.Spec.Version
}

return *version
}
Copy link
Contributor

Choose a reason for hiding this comment

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

I suggest letting pd tell operator the PDVersion (Don't know how or whether it exists) instead of judging it from spec.pd.version as we can't solve the case like version: nightly.

Copy link
Contributor Author

@weekface weekface May 7, 2020

Choose a reason for hiding this comment

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

I don't known how to let pd tell its version before starting it.

@weekface weekface requested a review from cofyc May 7, 2020 10:03
pkg/manager/member/pd_member_manager.go Outdated Show resolved Hide resolved
pkg/manager/member/pd_member_manager.go Outdated Show resolved Hide resolved
pkg/manager/member/pd_member_manager.go Show resolved Hide resolved
@weekface weekface requested review from cofyc and Yisaer May 7, 2020 10:12
cofyc
cofyc previously approved these changes May 7, 2020
@weekface
Copy link
Contributor Author

weekface commented May 7, 2020

/run-e2e-tests

@weekface weekface requested review from cofyc and DanielZhangQD May 8, 2020 04:48
@weekface weekface requested a review from DanielZhangQD May 8, 2020 06:42
Copy link
Contributor

@DanielZhangQD DanielZhangQD left a comment

Choose a reason for hiding this comment

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

LGTM

@weekface
Copy link
Contributor Author

weekface commented May 8, 2020

/merge

@sre-bot
Copy link
Contributor

sre-bot commented May 8, 2020

/run-all-tests

@sre-bot sre-bot merged commit a7483a7 into pingcap:master May 8, 2020
@weekface weekface deleted the fix-pd-tls branch May 8, 2020 09:49
sre-bot pushed a commit to sre-bot/tidb-operator that referenced this pull request May 8, 2020
@sre-bot
Copy link
Contributor

sre-bot commented May 8, 2020

cherry pick to release-1.1 in PR #2401

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

PD < v4.0 shouldn't expect a client cert when server TLS is enabled
5 participants