Skip to content

Commit d70676f

Browse files
committed
chore: respect namespace in report cluster
1 parent b49962c commit d70676f

2 files changed

Lines changed: 14 additions & 4 deletions

File tree

‎pkg/cmd/report/report.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -437,10 +437,12 @@ func (o *reportClusterOptions) complete(f cmdutil.Factory) error {
437437
if err := o.reportOptions.complete(f); err != nil {
438438
return err
439439
}
440-
// update namespace
441-
o.namespace, _, err = f.ToRawKubeConfigLoader().Namespace()
442-
if err != nil {
443-
return err
440+
// update namespace if not specified
441+
if o.namespace == "" {
442+
o.namespace, _, err = f.ToRawKubeConfigLoader().Namespace()
443+
if err != nil {
444+
return err
445+
}
444446
}
445447
// complete file name
446448

‎pkg/cmd/report/report_test.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,14 @@ var _ = Describe("report", func() {
452452
Expect(o.file).Should(MatchRegexp("report-cluster-.*.zip"))
453453
})
454454

455+
It("complete cluster-report options should respect specified namespace", func() {
456+
o := reportClusterOptions{reportOptions: newReportOptions(streams)}
457+
o.outputFormat = jsonFormat
458+
o.namespace = "demo"
459+
Expect(o.complete(tf)).To(Succeed())
460+
Expect(o.namespace).Should(Equal("demo"))
461+
})
462+
455463
It("handle cluster-report manifests", func() {
456464
o := reportClusterOptions{reportOptions: newReportOptions(streams)}
457465
o.outputFormat = jsonFormat

0 commit comments

Comments
 (0)