Merge pull request #2468 from hmrm/improve-kubectl-error-message

Improve kubectl "get" error message

Merge pull request #2468 from hmrm/improve-kubectl-error-message
4e29068a · Daniel Smith · 0975ab19 · bc299031 · 4e29068a
Commit 4e29068a authored Nov 19, 2014 by Daniel Smith
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

resource.go pkg/kubectl/cmd/resource.go +4 -1

No files found.
--- a/pkg/kubectl/cmd/resource.go
+++ b/pkg/kubectl/cmd/resource.go
@@ -44,7 +44,10 @@ func ResourceFromArgsOrFile(cmd *cobra.Command, args []string, filename string, 
 		}
 		version, kind, err := mapper.VersionAndKindForResource(resource)
-		checkErr(err)
+		if err != nil {
+			// The error returned by mapper is "no resource defined", which is a usage error
+			usageError(cmd, err.Error())
+		}
 		mapping, err = mapper.RESTMapping(version, kind)
 		checkErr(err)