percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-20 02:44:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

PT-1926: pt-k8s-debug-collector should not collect passwords (#497)

Browse Source 
https://jira.percona.com/browse/PT-1926

Save secrets only with configuration data
This commit is contained in:
Andrii Dema
2021-07-21 16:38:20 +03:00
committed by GitHub
parent bdbfd44a1f
commit 1114eb4dad
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,7 +39,6 @@ func New(location, namespace, resource string) Dumper {
"replicationcontrollers", "replicationcontrollers",
"events", "events",
"configmaps", "configmaps",
"secrets",
"cronjobs", "cronjobs",
"jobs", "jobs",
"podsecuritypolicies", "podsecuritypolicies",
@@ -170,6 +169,13 @@ func (d *Dumper) DumpCluster() error {
if d.crType == "psmdb" { if d.crType == "psmdb" {
component = "mongod" component = "mongod"
} }
if pod.Labels["app.kubernetes.io/instance"] != "" && pod.Labels["app.kubernetes.io/component"] != "" {
resource := "secret/" + pod.Labels["app.kubernetes.io/instance"] + "-" + pod.Labels["app.kubernetes.io/component"]
err = d.getResource(resource, ns.Name, true, tw)
if err != nil {
log.Printf("Error: get %s resource: %v", resource, err)
}
}
if pod.Labels["app.kubernetes.io/component"] == component { if pod.Labels["app.kubernetes.io/component"] == component {
output, err = d.getPodSummary(d.crType, pod.Name, pod.Labels["app.kubernetes.io/instance"], tw) output, err = d.getPodSummary(d.crType, pod.Name, pod.Labels["app.kubernetes.io/instance"], tw)
if err != nil { if err != nil {
@@ -189,14 +195,14 @@ func (d *Dumper) DumpCluster() error {
} }
for _, resource := range d.resources { for _, resource := range d.resources {
err = d.getResource(resource, ns.Name, tw) err = d.getResource(resource, ns.Name, false, tw)
if err != nil { if err != nil {
log.Printf("Error: get %s resource: %v", resource, err) log.Printf("Error: get %s resource: %v", resource, err)
} }
} }
} }
err = d.getResource("nodes", "", tw) err = d.getResource("nodes", "", false, tw)
if err != nil { if err != nil {
return errors.Wrapf(err, "get nodes") return errors.Wrapf(err, "get nodes")
} }
@@ -218,9 +224,12 @@ func (d *Dumper) runCmd(args ...string) ([]byte, error) {
return outb.Bytes(), nil return outb.Bytes(), nil
} }
func (d *Dumper) getResource(name, namespace string, tw *tar.Writer) error { func (d *Dumper) getResource(name, namespace string, ignoreNotFound bool, tw *tar.Writer) error {
location := d.location location := d.location
args := []string{"get", name, "-o", "yaml"} args := []string{"get", name, "-o", "yaml"}
if ignoreNotFound {
args = append(args, "--ignore-not-found")
}
if len(namespace) > 0 { if len(namespace) > 0 {
args = append(args, "--namespace", namespace) args = append(args, "--namespace", namespace)
location = filepath.Join(d.location, namespace) location = filepath.Join(d.location, namespace)
@@ -233,6 +242,9 @@ func (d *Dumper) getResource(name, namespace string, tw *tar.Writer) error {
return addToArchive(location, d.mode, []byte(err.Error()), tw) return addToArchive(location, d.mode, []byte(err.Error()), tw)
} }
if ignoreNotFound && len(output) == 0 {
return nil
}
return addToArchive(location, d.mode, output, tw) return addToArchive(location, d.mode, output, tw)
} }