Merge pull request #35777 from redhatlinux10/fix-inconsistent-util-package-import

Automatic merge from submit-queue make kubeadm version use kubeadmutil What this PR does / why we need it: this PR makes sure `kubeadmutil.CheckErr()` other than `cmdutil.CheckErr()` is called in `kubeadm version` subcommand. in `version.go`, `RunVersion()` function only returns `nil`, `kubeadmutil.CheckErr()` is enough for this Signed-off-by: redhatlinux10 <ouyang.qinhua@zte.com.cn>

Merge pull request #35777 from redhatlinux10/fix-inconsistent-util-package-import
e4b41dd2 · Kubernetes Submit Queue · GitHub · 8ca348a7 · 67f379e5 · e4b41dd2
Commit e4b41dd2 authored Oct 30, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 30, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

version.go cmd/kubeadm/app/cmd/version.go +2 -2

No files found.
--- a/cmd/kubeadm/app/cmd/version.go
+++ b/cmd/kubeadm/app/cmd/version.go
@@ -22,7 +22,7 @@ import (

 	"github.com/spf13/cobra"

-	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
+	kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
 	"k8s.io/kubernetes/pkg/version"
 )

@@ -32,7 +32,7 @@ func NewCmdVersion(out io.Writer) *cobra.Command {
 		Short: "Print the version of kubeadm",
 		Run: func(cmd *cobra.Command, args []string) {
 			err := RunVersion(out, cmd)
-			cmdutil.CheckErr(err)
+			kubeadmutil.CheckErr(err)
 		},
 	}
 	return cmd