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

cluster: fix TLS configs for tiproxy #2356

Merged
merged 4 commits into from
Jan 11, 2024
Merged

Conversation

xhebox
Copy link
Collaborator

@xhebox xhebox commented Jan 9, 2024

What problem does this PR solve?

  1. server-tls of tidb is manually specified, so does tiproxy's server-tls. Instead, for newer tiproxy, server-http-tls should be specified.
  2. topo.GlobalOptions.TLSEnabled is not passed to setTLSConfig.
  3. remove schema:// and be consistent with tidb

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Code changes

  • Has exported function/method change
  • Has exported variable/fields change
  • Has interface methods change
  • Has persistent data change

Side effects

  • Possible performance regression
  • Increased code complexity
  • Breaking backward compatibility

Related changes

  • Need to cherry-pick to the release branch
  • Need to update the documentation

Release notes:

NONE

Signed-off-by: xhe <xw897002528@gmail.com>
@ti-chi-bot ti-chi-bot bot requested a review from srstack January 9, 2024 09:28
@ti-chi-bot ti-chi-bot bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 9, 2024
@codecov-commenter
Copy link

codecov-commenter commented Jan 9, 2024

Codecov Report

Attention: 14 lines in your changes are missing coverage. Please review.

Comparison is base (30d4413) 55.43% compared to head (d64dbf0) 55.42%.

❗ Current head d64dbf0 differs from pull request most recent head 653fb94. Consider uploading reports for the commit 653fb94 to get more accurate results

Files Patch % Lines
pkg/cluster/spec/tiproxy.go 0.00% 14 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2356      +/-   ##
==========================================
- Coverage   55.43%   55.42%   -0.01%     
==========================================
  Files         329      329              
  Lines       34838    34845       +7     
==========================================
  Hits        19310    19310              
- Misses      13216    13223       +7     
  Partials     2312     2312              
Flag Coverage Δ
tiup 33.60% <ø> (ø)
unittest 22.33% <0.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ti-chi-bot ti-chi-bot 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 Jan 9, 2024
@xhebox xhebox force-pushed the master branch 4 times, most recently from 9b5ee60 to c119143 Compare January 9, 2024 10:13
This reverts commit a6f673f.

Signed-off-by: xhe <xw897002528@gmail.com>
@xhebox xhebox changed the title cluster: fix pdaddrs on TLS cluster: fix TLS configs for tiprox Jan 9, 2024
@xhebox xhebox changed the title cluster: fix TLS configs for tiprox cluster: fix TLS configs for tiproxy Jan 9, 2024
@kaaaaaaang
Copy link
Collaborator

/lgtm

@ti-chi-bot ti-chi-bot bot added the lgtm label Jan 9, 2024
@kaaaaaaang
Copy link
Collaborator

/approve

@ti-chi-bot ti-chi-bot bot added the approved label Jan 9, 2024
Signed-off-by: xhe <xw897002528@gmail.com>
@ti-chi-bot ti-chi-bot bot removed the lgtm label Jan 10, 2024
Copy link
Contributor

ti-chi-bot bot commented Jan 10, 2024

@xhebox: Your PR was out of date, I have automatically updated it for you.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@kaaaaaaang
Copy link
Collaborator

/lgtm

@ti-chi-bot ti-chi-bot bot added the lgtm label Jan 11, 2024
@kaaaaaaang
Copy link
Collaborator

/approve

Copy link
Contributor

ti-chi-bot bot commented Jan 11, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-01-09 12:57:42.700564297 +0000 UTC m=+361652.284817983: ☑️ agreed by kaaaaaaang.
  • 2024-01-10 08:11:57.320143046 +0000 UTC m=+430906.904396718: ✖️🔁 reset by xhebox.
  • 2024-01-11 07:42:02.292582952 +0000 UTC m=+515511.876836638: ☑️ agreed by kaaaaaaang.

Copy link
Contributor

ti-chi-bot bot commented Jan 11, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kaaaaaaang

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kaaaaaaang kaaaaaaang added this to the v1.14.1 milestone Jan 11, 2024
@ti-chi-bot ti-chi-bot bot merged commit 0c6dda9 into pingcap:master Jan 11, 2024
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants