Merge pull request #80873 from tedyu/kube-get-ns

Omit namespace when kubectl get is for the cluster
This commit is contained in:
Kubernetes Prow Robot 2019-08-02 20:28:18 -07:00 committed by GitHub
commit f19863c829
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -581,8 +581,11 @@ func (o *GetOptions) Run(f cmdutil.Factory, cmd *cobra.Command, args []string) e
w.Flush() w.Flush()
if trackingWriter.Written == 0 && !o.IgnoreNotFound && len(allErrs) == 0 { if trackingWriter.Written == 0 && !o.IgnoreNotFound && len(allErrs) == 0 {
// if we wrote no output, and had no errors, and are not ignoring NotFound, be sure we output something // if we wrote no output, and had no errors, and are not ignoring NotFound, be sure we output something
noResourcesFoundFormat := fmt.Sprintf("No resources found in %s namespace.", o.Namespace) if !o.AllNamespaces {
fmt.Fprintln(o.ErrOut, noResourcesFoundFormat) fmt.Fprintln(o.ErrOut, fmt.Sprintf("No resources found in %s namespace.", o.Namespace))
} else {
fmt.Fprintln(o.ErrOut, fmt.Sprintf("No resources found"))
}
} }
return utilerrors.NewAggregate(allErrs) return utilerrors.NewAggregate(allErrs)
} }