@@ -109,7 +109,7 @@ func NewCommandAdmin(name, fullName string, out io.Writer) *cobra.Command {

 	}

 	if name == fullName {

-		cmds.AddCommand(version.NewVersionCommand(fullName))

+		cmds.AddCommand(version.NewVersionCommand(fullName, false))

 	}

 	cmds.AddCommand(cmd.NewCmdOptions(out))

@@ -145,7 +145,7 @@ func NewCommandCLI(name, fullName string, in io.Reader, out, errout io.Writer) *

 		ExposeFlags(loginCmd, "certificate-authority", "insecure-skip-tls-verify")

 	if name == fullName {

-		cmds.AddCommand(version.NewVersionCommand(fullName))

+		cmds.AddCommand(version.NewVersionCommand(fullName, false))

 	}

 	cmds.AddCommand(cmd.NewCmdOptions(out))

@@ -50,7 +50,7 @@ func NewCommandSTIBuilder(name string) *cobra.Command {

 		},

 	}

-	cmd.AddCommand(version.NewVersionCommand(name))

+	cmd.AddCommand(version.NewVersionCommand(name, false))

 	return cmd

 }

@@ -64,6 +64,6 @@ func NewCommandDockerBuilder(name string) *cobra.Command {

 			cmd.RunDockerBuild()

 		},

 	}

-	cmd.AddCommand(version.NewVersionCommand(name))

+	cmd.AddCommand(version.NewVersionCommand(name, false))

 	return cmd

 }

@@ -66,7 +66,7 @@ func NewCommandDeployer(name string) *cobra.Command {

 		},

 	}

-	cmd.AddCommand(version.NewVersionCommand(name))

+	cmd.AddCommand(version.NewVersionCommand(name, false))

 	flag := cmd.Flags()

 	cfg.Config.Bind(flag)

@@ -126,7 +126,7 @@ func NewCommandF5Router(name string) *cobra.Command {

 		},

 	}

-	cmd.AddCommand(version.NewVersionCommand(name))

+	cmd.AddCommand(version.NewVersionCommand(name, false))

 	flag := cmd.Flags()

 	options.Config.Bind(flag)

@@ -90,7 +90,7 @@ func NewCommandTemplateRouter(name string) *cobra.Command {

 		},

 	}

-	cmd.AddCommand(version.NewVersionCommand(name))

+	cmd.AddCommand(version.NewVersionCommand(name, false))

 	flag := cmd.Flags()

 	options.Config.Bind(flag)

@@ -110,7 +110,7 @@ func NewCommandOpenShift(name string) *cobra.Command {

 	root.AddCommand(cli.NewCommandCLI("cli", name+" cli", in, out, errout))

 	root.AddCommand(cli.NewCmdKubectl("kube", out))

 	root.AddCommand(newExperimentalCommand("ex", name+" ex"))

-	root.AddCommand(version.NewVersionCommand(name))

+	root.AddCommand(version.NewVersionCommand(name, true))

 	// infra commands are those that are bundled with the binary but not displayed to end users

 	// directly

@@ -37,7 +37,7 @@ func NewCommand(name, fullName string, out io.Writer) *cobra.Command {

 	cmds.AddCommand(NewProxyCommand("proxy", fullName+" proxy", out))

 	cmds.AddCommand(NewSchedulerCommand("scheduler", fullName+" scheduler", out))

 	if "hyperkube" == fullName {

-		cmds.AddCommand(version.NewVersionCommand(fullName))

+		cmds.AddCommand(version.NewVersionCommand(fullName, false))

 	}

 	return cmds

@@ -3,6 +3,7 @@ package version

 import (

 	"fmt"

+	etcdversion "github.com/coreos/etcd/version"

 	"github.com/prometheus/client_golang/prometheus"

 	"github.com/spf13/cobra"

 	kubeversion "k8s.io/kubernetes/pkg/version"

@@ -52,13 +53,16 @@ func (info Info) String() string {

 }

 // NewVersionCommand creates a command for displaying the version of this binary

-func NewVersionCommand(basename string) *cobra.Command {

+func NewVersionCommand(basename string, printEtcdVersion bool) *cobra.Command {

 	return &cobra.Command{

 		Use:   "version",

 		Short: "Display version",

 		Run: func(c *cobra.Command, args []string) {

 			fmt.Printf("%s %v\n", basename, Get())

 			fmt.Printf("kubernetes %v\n", kubeversion.Get())

+			if printEtcdVersion {

+				fmt.Printf("etcd %v\n", etcdversion.Version)

+			}

 		},

 	}

 }