Merge pull request #54373 from dims/better-error-check-for-cluster-info

Automatic merge from submit-queue (batch tested with PRs 53479, 54373, 54441, 54443). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Better error check for kubectl cluster-info **What this PR does / why we need it**: In RunClusterInfo, We try to connect to the api service and get some information, but we just ignore the errors from Do().Visit(). We should return the error returned by Do().Visit() so the "kubectl cluster-info" would fail correctly with an error code. In RunClusterInfo, We try to connect to the api service and get some information, but we just ignore the errors from Do().Visit(). We should return the error returned by Do().Visit() so the "kubectl cluster-info" would fail correctly with an error code. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # Fixes #54349 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #54373 from dims/better-error-check-for-cluster-info
f7dbe30f · Kubernetes Submit Queue · GitHub · df03cf71 · 998f3327 · f7dbe30f
Commit f7dbe30f authored Oct 23, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 23, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

clusterinfo.go pkg/kubectl/cmd/clusterinfo.go +2 -2

No files found.
--- a/pkg/kubectl/cmd/clusterinfo.go
+++ b/pkg/kubectl/cmd/clusterinfo.go
@@ -77,7 +77,7 @@ func RunClusterInfo(f cmdutil.Factory, out io.Writer, cmd *cobra.Command) error 
 		SelectorParam("kubernetes.io/cluster-service=true").
 		ResourceTypeOrNameArgs(false, []string{"services"}...).
 		Latest()
-	b.Do().Visit(func(r *resource.Info, err error) error {
+	err = b.Do().Visit(func(r *resource.Info, err error) error {
 		if err != nil {
 			return err
 		}
@@ -125,7 +125,7 @@ func RunClusterInfo(f cmdutil.Factory, out io.Writer, cmd *cobra.Command) error 
 		return nil
 	})
 	out.Write([]byte("\nTo further debug and diagnose cluster problems, use 'kubectl cluster-info dump'.\n"))
-	return nil
+	return err

 	// TODO consider printing more information about cluster
 }