percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2026-01-28 02:00:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #805 from percona/PT-2302_pt-k8s-debug-collector_cannot_pass_properly_to_pt-mysql-summary_PXC_root_password_with_special_characters

Browse Source 
Pt 2302 pt k8s debug collector cannot pass properly to pt mysql summary pxc root password with special characters
This commit is contained in:
Sveta Smirnova
2024-04-22 18:56:01 +03:00
committed by GitHub
parent 4785d7f0d2 e0b2d81307
commit a732798446
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/go/pt-k8s-debug-collector/dumper/dumper.go
View File

@@ -421,15 +421,15 @@ func (d *Dumper) getPodSummary(resource, podName, crName string, namespace strin
}
ports = port + ":3306"
summCmdName = "pt-mysql-summary"
summCmdArgs = []string{"--host=127.0.0.1", "--port=" + port, "--user=root", "--password='" + string(pass) + "'"}
case "pg","pgv2":
var kubeconfig string=""
if d.kubeconfig != "" {
kubeconfig=" --kubeconfig=" + d.kubeconfig
summCmdArgs = []string{"--host=127.0.0.1", "--port=" + port, "--user=root", "--password=" + string(pass)}
case "pg", "pgv2":
var kubeconfig string
if d.kubeconfig != "" {
kubeconfig = " --kubeconfig=" + d.kubeconfig
}
summCmdName = "sh"
summCmdArgs = []string{"-c", "curl https://raw.githubusercontent.com/percona/support-snippets/master/postgresql/pg_gather/gather.sql 2>/dev/null | " +
d.cmd + kubeconfig + " -n "+ namespace + " exec -i "+ podName +" -- psql -X -f - "}
d.cmd + kubeconfig + " -n " + namespace + " exec -i " + podName + " -- psql -X -f - "}
case "psmdb":
var port string
if d.forwardport != "" {
@@ -443,7 +443,7 @@ func (d *Dumper) getPodSummary(resource, podName, crName string, namespace strin
}
user, err := d.getDataFromSecret(cr.Spec.Secrets.Users, "MONGODB_DATABASE_ADMIN_USER", namespace)
if err != nil {
return nil, errors.Wrap(err, "get password from psmdb users secret")
return nil, errors.Wrap(err, "get user name from psmdb users secret")
}
pass, err := d.getDataFromSecret(cr.Spec.Secrets.Users, "MONGODB_DATABASE_ADMIN_PASSWORD", namespace)
if err != nil {
@@ -451,7 +451,7 @@ func (d *Dumper) getPodSummary(resource, podName, crName string, namespace strin
}
ports = port + ":27017"
summCmdName = "pt-mongodb-summary"
summCmdArgs = []string{"--username='" + user + "'", "--password='" + pass + "'", "--authenticationDatabase=admin", "127.0.0.1:" + port}
summCmdArgs = []string{"--username=" + user, "--password=" + string(pass), "--authenticationDatabase=admin", "127.0.0.1:" + port}
}
cmdPortFwd := exec.Command(d.cmd, "port-forward", "pod/"+podName, ports, "-n", namespace, "--kubeconfig", d.kubeconfig)