Skip to content

Commit 5f2525b

Browse files
committed
Report back some basic progress
1 parent afa0bc5 commit 5f2525b

File tree

2 files changed

+29
-0
lines changed

2 files changed

+29
-0
lines changed

cmd/preflight/cli/run.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,20 @@ func runPreflights(v *viper.Viper, arg string) error {
121121
}
122122
}
123123
}()
124+
} else {
125+
// make sure we don't block any senders
126+
go func() {
127+
for {
128+
select {
129+
case _, ok := <-progressCh:
130+
if !ok {
131+
return
132+
}
133+
case <-finishedCh:
134+
return
135+
}
136+
}
137+
}()
124138
}
125139

126140
defer func() {

pkg/preflight/collect.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ type CollectOpts struct {
1818
ProgressChan chan interface{}
1919
}
2020

21+
type CollectProgress struct {
22+
Name string
23+
Status string
24+
}
25+
2126
type CollectResult interface {
2227
Analyze() []*analyze.AnalyzeResult
2328
IsRBACAllowed() bool
@@ -144,12 +149,22 @@ func Collect(opts CollectOpts, p *troubleshootv1beta2.Preflight) (CollectResult,
144149
}
145150
}
146151

152+
opts.ProgressChan <- CollectProgress{
153+
Name: collector.GetDisplayName(),
154+
Status: "running",
155+
}
156+
147157
result, err := collector.RunCollectorSync(nil)
148158
if err != nil {
149159
opts.ProgressChan <- errors.Errorf("failed to run collector %s: %v\n", collector.GetDisplayName(), err)
150160
continue
151161
}
152162

163+
opts.ProgressChan <- CollectProgress{
164+
Name: collector.GetDisplayName(),
165+
Status: "completed",
166+
}
167+
153168
if result != nil {
154169
for k, v := range result {
155170
allCollectedData[k] = v

0 commit comments

Comments
 (0)