Skip to content

Update dumper.go #957

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

Open
wants to merge 1 commit into
base: 3.x
Choose a base branch
from
Open

Update dumper.go #957

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 18 additions & 1 deletion src/go/pt-k8s-debug-collector/dumper/dumper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ func (d *Dumper) DumpCluster() error {
}

for _, pod := range pods.Items {
// ---- logs.txt ----
location := filepath.Join(d.location, ns.Name, pod.Name, "logs.txt")
args := []string{"logs", pod.Name, "--namespace", ns.Name, "--all-containers"}
output, err = d.runCmd(args...)
Expand All @@ -322,6 +323,22 @@ func (d *Dumper) DumpCluster() error {
d.logError(err.Error(), "create archive for pod "+pod.Name)
log.Printf("Error: create archive for pod %s: %v", pod.Name, err)
}

// ---- describe.txt ----
describePath := filepath.Join(d.location, ns.Name, pod.Name, "describe.txt")
args = []string{"describe", "pod", pod.Name, "--namespace", ns.Name}
describeOutput, err := d.runCmd(args...)
if err != nil {
d.logError(err.Error(), args...)
describeOutput = []byte("Error: " + err.Error())
}
err = addToArchive(describePath, d.mode, describeOutput, tw)
if err != nil {
d.logError(err.Error(), "create describe archive for pod "+pod.Name)
log.Printf("Error: create describe archive for pod %s: %v", pod.Name, err)
}

// ---- labels and summary.txt ----
if len(pod.Labels) == 0 {
continue
}
Expand Down Expand Up @@ -351,7 +368,6 @@ func (d *Dumper) DumpCluster() error {
} else {
crName = pod.Labels["app.kubernetes.io/instance"]
}
// Get summary
output, err = d.getPodSummary(resourceType(d.crType), pod.Name, crName, ns.Name)
if err != nil {
d.logError(err.Error(), d.crType, pod.Name)
Expand Down Expand Up @@ -402,6 +418,7 @@ func (d *Dumper) DumpCluster() error {
return nil
}


// runCmd run command (Dumper.cmd) with given args, return it output
func (d *Dumper) runCmd(args ...string) ([]byte, error) {
var outb, errb bytes.Buffer
Expand Down
Loading