From bc29903146bfde30e186f28039eddb4b3d65bf8d Mon Sep 17 00:00:00 2001
From: Haney Maxwell <hmrmaxwell@gmail.com>
Date: Wed, 19 Nov 2014 11:59:39 -0800
Subject: [PATCH] Improve kubectl "get" error message

Previous behavior:
$ kubectl get hosts
F1119 11:47:44.787154   29017 resource.go:111] no resource "hosts" has been defined
---
 pkg/kubectl/cmd/resource.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg/kubectl/cmd/resource.go b/pkg/kubectl/cmd/resource.go
index 27559beb487..8edaa2fd198 100644
--- 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)