Merge pull request kubernetes#88765 from brianpursley/kubectl-816-take2

k8s-ci-robot · web-flow · commit d682c8389087 · 2020-03-04T10:20:02.000-08:00
Change kubectl cluster-info dump to not display output location message when output is stdout
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/clusterinfo_dump.go b/staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/clusterinfo_dump.go
@@ -300,10 +300,7 @@ func (o *ClusterInfoDumpOptions) Run() error {
 	}
 
 	dest := o.OutputDir
-	if len(dest) == 0 {
-		dest = "standard output"
-	}
-	if dest != "-" {
+	if len(dest) > 0 && dest != "-" {
 		fmt.Fprintf(o.Out, "Cluster info dumped to %s\n", dest)
 	}
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -300,10 +300,7 @@ func (o *ClusterInfoDumpOptions) Run() error {`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`dest := o.OutputDir`
`303`		`- if len(dest) == 0 {`
`304`		`- dest = "standard output"`
`305`		`- }`
`306`		`- if dest != "-" {`
	`303`	`+ if len(dest) > 0 && dest != "-" {`
`307`	`304`	`fmt.Fprintf(o.Out, "Cluster info dumped to %s\n", dest)`
`308`	`305`	`}`
`309`	`306`	`return nil`