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

feat: copy file after execution of RunPod and Exec collector #1682

Closed
wants to merge 1 commit into from
Closed

feat: copy file after execution of RunPod and Exec collector #1682

Show file tree
Hide file tree
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
17 changes: 17 additions & 0 deletions pkg/collect/collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,3 +286,20 @@ func DedupCollectors(allCollectors []*troubleshootv1beta2.Collect) []*troublesho
}
return finalCollectors
}

// Ensure Copy collectors are last in the list
// This is because copy collectors are expected to copy files from other collectors such as Exec, RunPod, RunDaemonSet
func EnsureCopyLast(allCollectors []Collector) []Collector {
otherCollectors := make([]Collector, 0)
copyCollectors := make([]Collector, 0)

for _, collector := range allCollectors {
if _, ok := collector.(*CollectCopy); ok {
copyCollectors = append(copyCollectors, collector)
} else {
otherCollectors = append(otherCollectors, collector)
}
}

return append(otherCollectors, copyCollectors...)
}
3 changes: 3 additions & 0 deletions pkg/supportbundle/collect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@ func runCollectors(ctx context.Context, collectors []*troubleshootv1beta2.Collec
return nil, collect.ErrInsufficientPermissionsToRun
}

// move Copy Collectors if any to the end of the execution list
allCollectors = collect.EnsureCopyLast(allCollectors)

for _, collector := range allCollectors {
_, span := otel.Tracer(constants.LIB_TRACER_NAME).Start(ctx, collector.Title())
span.SetAttributes(attribute.String("type", reflect.TypeOf(collector).String()))
Expand Down
Loading