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

binglog: fix tls error when create pump with TLS when use CRD #1799

Merged
merged 10 commits into from
Feb 27, 2020
Merged

binglog: fix tls error when create pump with TLS when use CRD #1799

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ed63d6d
deploy: close connection after set privilege
shuijing198799 Feb 13, 2020
3e2b2d5
pump: add tls to create pump
shuijing198799 Feb 19, 2020
7888c78
address comment
shuijing198799 Feb 26, 2020
ca7c769
Script and certcontrol use the same secretname
shuijing198799 Feb 26, 2020
9071122
address comment
shuijing198799 Feb 26, 2020
6af165a
address comment
shuijing198799 Feb 26, 2020
87867cc
address comment
shuijing198799 Feb 26, 2020
ad88e5b
address comment
shuijing198799 Feb 26, 2020
b8dcccb
Merge remote-tracking branch 'upstream/master' into yinliang/add-pump…
shuijing198799 Feb 27, 2020
013710f
binlog: fix tls error when create pump use CRD
shuijing198799 Feb 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/manager/member/pump_member_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,9 @@ func getNewPumpConfigMap(tc *v1alpha1.TidbCluster) (*corev1.ConfigMap, error) {
confTextStr = strings.Join([]string{
confTextStr,
"[security]",
serviceAccountCAPath,
path.Join(pumpCertPath, "cert"),
path.Join(pumpCertPath, "key")}, "\n")
fmt.Sprintf("ssl-ca = \"%s\"", serviceAccountCAPath),
fmt.Sprintf("ssl-cert = \"%s\"", path.Join(pumpCertPath, "cert")),
fmt.Sprintf("ssl-key = \"%s\"", path.Join(pumpCertPath, "key"))}, "\n")
}
data := map[string]string{
"pump-config": confTextStr,
Expand Down