diff options
Diffstat (limited to 'testing/kubernetes/remove-apiserver-add-kube-prefix-for-hyperkube.patch')
| -rw-r--r-- | testing/kubernetes/remove-apiserver-add-kube-prefix-for-hyperkube.patch | 14 |
1 files changed, 7 insertions, 7 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 ebdade780a..c336864b07 100644 --- a/testing/kubernetes/remove-apiserver-add-kube-prefix-for-hyperkube.patch +++ b/testing/kubernetes/remove-apiserver-add-kube-prefix-for-hyperkube.patch @@ -1,16 +1,16 @@ --- 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" +@@ -36,7 +36,6 @@ + cliflag "k8s.io/component-base/cli/flag" + "k8s.io/component-base/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 +@@ -87,12 +86,6 @@ + func NewHyperKubeCommand(stopCh <-chan struct{}) (*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) @@ -21,7 +21,7 @@ controller := func() *cobra.Command { ret := kubecontrollermanager.NewControllerManagerCommand() // add back some unfortunate aliases that should be removed -@@ -115,7 +108,6 @@ +@@ -116,7 +109,6 @@ cloudController := func() *cobra.Command { return cloudcontrollermanager.NewCloudControllerManagerCommand() } commandFns := []func() *cobra.Command{ |