Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
10 changes: 6 additions & 4 deletions pkg/cmd/report/report.go
Original file line number Diff line number Diff line change
Expand Up @@ -437,10 +437,12 @@ func (o *reportClusterOptions) complete(f cmdutil.Factory) error {
if err := o.reportOptions.complete(f); err != nil {
return err
}
// update namespace
o.namespace, _, err = f.ToRawKubeConfigLoader().Namespace()
if err != nil {
return err
// update namespace if not specified
if o.namespace == "" {
o.namespace, _, err = f.ToRawKubeConfigLoader().Namespace()
if err != nil {
return err
}
}
// complete file name

Expand Down
8 changes: 8 additions & 0 deletions pkg/cmd/report/report_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,14 @@ var _ = Describe("report", func() {
Expect(o.file).Should(MatchRegexp("report-cluster-.*.zip"))
})

It("complete cluster-report options should respect specified namespace", func() {
o := reportClusterOptions{reportOptions: newReportOptions(streams)}
o.outputFormat = jsonFormat
o.namespace = "demo"
Expect(o.complete(tf)).To(Succeed())
Expect(o.namespace).Should(Equal("demo"))
})

It("handle cluster-report manifests", func() {
o := reportClusterOptions{reportOptions: newReportOptions(streams)}
o.outputFormat = jsonFormat
Expand Down
Loading