Merge pull request #3177 from briandowns/backport_pr_3155

pkg/cli/cmds/nocluster.go

-// +build no_etcd
-
-package cmds
-
-const (
-	hideClusterFlags = true
-)

pkg/cli/cmds/server.go

@@ -12,7 +12,6 @@ const (
 
 	defaultSnapshotRentention    = 5
 	defaultSnapshotIntervalHours = 12
-	hideClusterFlags             = true
 )
 
 type Server struct {
@@ -333,19 +332,19 @@ func NewServerCommand(action func(*cli.Context) error) cli.Command {
 			},
 			cli.BoolFlag{
 				Name:        "disable-api-server",
-				Hidden:      hideClusterFlags,
+				Hidden:      true,
 				Usage:       "(experimental/components) Disable running api server",
 				Destination: &ServerConfig.DisableAPIServer,
 			},
 			cli.BoolFlag{
 				Name:        "disable-controller-manager",
-				Hidden:      hideClusterFlags,
+				Hidden:      true,
 				Usage:       "(experimental/components) Disable running kube-controller-manager",
 				Destination: &ServerConfig.DisableControllerManager,
 			},
 			cli.BoolFlag{
 				Name:        "disable-etcd",
-				Hidden:      hideClusterFlags,
+				Hidden:      true,
 				Usage:       "(experimental/components) Disable running etcd",
 				Destination: &ServerConfig.DisableETCD,
 			},
@@ -385,21 +384,18 @@ func NewServerCommand(action func(*cli.Context) error) cli.Command {
 			},
 			cli.StringFlag{
 				Name:        "server,s",
-				Hidden:      hideClusterFlags,
 				Usage:       "(experimental/cluster) Server to connect to, used to join a cluster",
 				EnvVar:      version.ProgramUpper + "_URL",
 				Destination: &ServerConfig.ServerURL,
 			},
 			cli.BoolFlag{
 				Name:        "cluster-init",
-				Hidden:      hideClusterFlags,
-				Usage:       "(experimental/cluster) Initialize a new cluster",
+				Usage:       "(experimental/cluster) Initialize a new cluster using embedded Etcd",
 				EnvVar:      version.ProgramUpper + "_CLUSTER_INIT",
 				Destination: &ServerConfig.ClusterInit,
 			},
 			cli.BoolFlag{
 				Name:        "cluster-reset",
-				Hidden:      hideClusterFlags,
 				Usage:       "(experimental/cluster) Forget all peers and become sole member of a new cluster",
 				EnvVar:      version.ProgramUpper + "_CLUSTER_RESET",
 				Destination: &ServerConfig.ClusterReset,

pkg/cluster/etcd.go

-// +build !no_etcd
-
 package cluster
 
 import (