From 87abe13022b063cf981a5a9679aa59be40f68efc Mon Sep 17 00:00:00 2001
From: Shiyang Wang <shiywang@redhat.com>
Date: Tue, 15 Aug 2017 16:01:28 +0800
Subject: [PATCH] fix return 0 error in DefaultSubCommandRun

---
 hack/make-rules/test-cmd-util.sh | 4 ++--
 pkg/kubectl/cmd/util/helpers.go  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hack/make-rules/test-cmd-util.sh b/hack/make-rules/test-cmd-util.sh
index a0632ef62b9..aae98e33952 100755
--- a/hack/make-rules/test-cmd-util.sh
+++ b/hack/make-rules/test-cmd-util.sh
@@ -4188,7 +4188,7 @@ run_plugins_tests() {
   kube::test::if_has_string "${output_message}" 'no plugins installed'
 
   # single plugins path
-  output_message=$(KUBECTL_PLUGINS_PATH=test/fixtures/pkg/kubectl/plugins kubectl plugin 2>&1)
+  output_message=$(! KUBECTL_PLUGINS_PATH=test/fixtures/pkg/kubectl/plugins kubectl plugin 2>&1)
   kube::test::if_has_string "${output_message}" 'echo\s\+Echoes for test-cmd'
   kube::test::if_has_string "${output_message}" 'get\s\+The wonderful new plugin-based get!'
   kube::test::if_has_string "${output_message}" 'error\s\+The tremendous plugin that always fails!'
@@ -4225,7 +4225,7 @@ run_plugins_tests() {
   kube::test::if_has_string "${output_message}" 'error: exit status 1'
 
   # plugin tree
-  output_message=$(KUBECTL_PLUGINS_PATH=test/fixtures/pkg/kubectl/plugins kubectl plugin tree 2>&1)
+  output_message=$(! KUBECTL_PLUGINS_PATH=test/fixtures/pkg/kubectl/plugins kubectl plugin tree 2>&1)
   kube::test::if_has_string "${output_message}" 'Plugin with a tree of commands'
   kube::test::if_has_string "${output_message}" 'child1\s\+The first child of a tree'
   kube::test::if_has_string "${output_message}" 'child2\s\+The second child of a tree'
diff --git a/pkg/kubectl/cmd/util/helpers.go b/pkg/kubectl/cmd/util/helpers.go
index b41af0f842f..36aac301fba 100644
--- a/pkg/kubectl/cmd/util/helpers.go
+++ b/pkg/kubectl/cmd/util/helpers.go
@@ -778,6 +778,7 @@ func DefaultSubCommandRun(out io.Writer) func(c *cobra.Command, args []string) {
 		c.SetOutput(out)
 		RequireNoArguments(c, args)
 		c.Help()
+		CheckErr(ErrExit)
 	}
 }