From 75c3cbcbfbec6009e1df65489e44b1949f148488 Mon Sep 17 00:00:00 2001
From: Janet Kuo <chiachenk@google.com>
Date: Wed, 8 Jun 2016 10:34:09 -0700
Subject: [PATCH] Don't ignore error when Discovery().ServerResources() in
 kubectl run

---
 pkg/kubectl/cmd/run.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/kubectl/cmd/run.go b/pkg/kubectl/cmd/run.go
index a73fb868309..371dcdf3a3d 100644
--- a/pkg/kubectl/cmd/run.go
+++ b/pkg/kubectl/cmd/run.go
@@ -155,9 +155,9 @@ func Run(f *cmdutil.Factory, cmdIn io.Reader, cmdOut, cmdErr io.Writer, cmd *cob
 			return err
 		}
 		resourcesList, err := client.Discovery().ServerResources()
+		// ServerResources ignores errors for old servers do not expose discovery
 		if err != nil {
-			// this cover the cases where old servers do not expose discovery
-			resourcesList = nil
+			return fmt.Errorf("failed to discover supported resources: %v", err)
 		}
 		switch restartPolicy {
 		case api.RestartPolicyAlways: