1 files changed, 30 insertions, 50 deletions
diff --git a/testing/kubernetes/remove-apiserver-add-kube-prefix-for-hyperkube.patch b/testing/kubernetes/remove-apiserver-add-kube-prefix-for-hyperkube.patch
index ad691e1c45..ebdade780a 100644
--- a/testing/kubernetes/remove-apiserver-add-kube-prefix-for-hyperkube.patch
+++ b/testing/kubernetes/remove-apiserver-add-kube-prefix-for-hyperkube.patch
@@ -1,51 +1,31 @@
-diff --git a/cmd/hyperkube/kube-controller-manager.go b/cmd/hyperkube/kube-controller-manager.go
-index 35061e9..482958d 100644
---- a/cmd/hyperkube/kube-controller-manager.go
-+++ b/cmd/hyperkube/kube-controller-manager.go
-@@ -29,7 +29,7 @@ func NewKubeControllerManager() *Server {
- 	hks := Server{
- 		name:            "controller-manager",
- 		AlternativeName: "kube-controller-manager",
--		SimpleUsage:     "controller-manager",
-+		SimpleUsage:     "kube-controller-manager",
- 		Long:            "A server that runs a set of active components. This includes replication controllers, service endpoints and nodes.",
- 		Run: func(_ *Server, args []string) error {
- 			return app.Run(s)
-diff --git a/cmd/hyperkube/kube-proxy.go b/cmd/hyperkube/kube-proxy.go
-index 76bc2dc..1eba8a7 100644
---- a/cmd/hyperkube/kube-proxy.go
-+++ b/cmd/hyperkube/kube-proxy.go
-@@ -33,7 +33,7 @@ func NewKubeProxy() *Server {
- 	hks := Server{
- 		name:            "proxy",
- 		AlternativeName: "kube-proxy",
--		SimpleUsage:     "proxy",
-+		SimpleUsage:     "kube-proxy",
- 		Long:            command.Long,
- 	}
+--- build/cmd/hyperkube/main.go.orig
++++ build/cmd/hyperkube/main.go
+@@ -35,7 +35,6 @@
+ 	utilflag "k8s.io/apiserver/pkg/util/flag"
+ 	"k8s.io/apiserver/pkg/util/logs"
+ 	cloudcontrollermanager "k8s.io/kubernetes/cmd/cloud-controller-manager/app"
+-	kubeapiserver "k8s.io/kubernetes/cmd/kube-apiserver/app"
+ 	kubecontrollermanager "k8s.io/kubernetes/cmd/kube-controller-manager/app"
+ 	kubeproxy "k8s.io/kubernetes/cmd/kube-proxy/app"
+ 	kubescheduler "k8s.io/kubernetes/cmd/kube-scheduler/app"
+@@ -86,12 +85,6 @@
+ func NewHyperKubeCommand() (*cobra.Command, []func() *cobra.Command) {
+ 	// these have to be functions since the command is polymorphic.  Cobra wants you to be  top level
+ 	// command to get executed
+-	apiserver := func() *cobra.Command {
+-		ret := kubeapiserver.NewAPIServerCommand(stopCh)
+-		// add back some unfortunate aliases that should be removed
+-		ret.Aliases = []string{"apiserver"}
+-		return ret
+-	}
+ 	controller := func() *cobra.Command {
+ 		ret := kubecontrollermanager.NewControllerManagerCommand()
+ 		// add back some unfortunate aliases that should be removed
+@@ -115,7 +108,6 @@
+ 	cloudController := func() *cobra.Command { return cloudcontrollermanager.NewCloudControllerManagerCommand() }
  
-diff --git a/cmd/hyperkube/kube-scheduler.go b/cmd/hyperkube/kube-scheduler.go
-index fd00103..587a9a1 100644
---- a/cmd/hyperkube/kube-scheduler.go
-+++ b/cmd/hyperkube/kube-scheduler.go
-@@ -29,7 +29,7 @@ func NewScheduler() *Server {
- 	hks := Server{
- 		name:            "scheduler",
- 		AlternativeName: "kube-scheduler",
--		SimpleUsage:     "scheduler",
-+		SimpleUsage:     "kube-scheduler",
- 		Long:            "Implements a Kubernetes scheduler.  This will assign pods to kubelets based on capacity and constraints.",
- 		Run: func(_ *Server, _ []string) error {
- 			return app.Run(s)
-diff --git a/cmd/hyperkube/main.go b/cmd/hyperkube/main.go
-index e1e07b7..10ed8b1 100644
---- a/cmd/hyperkube/main.go
-+++ b/cmd/hyperkube/main.go
-@@ -33,7 +33,6 @@ func main() {
- 	}
- 
- 	hk.AddServer(NewKubectlServer())
--	hk.AddServer(NewKubeAPIServer())
- 	hk.AddServer(NewKubeControllerManager())
- 	hk.AddServer(NewScheduler())
- 	hk.AddServer(NewKubelet())
+ 	commandFns := []func() *cobra.Command{
+-		apiserver,
+ 		controller,
+ 		proxy,
+ 		scheduler,