blob: ebdade780aca36fcf4555cebfa215466c76f7b50 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
--- 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() }
commandFns := []func() *cobra.Command{
- apiserver,
controller,
proxy,
scheduler,
|
