From 99dd9d3c8e5aafce3291c837528dfb0864f1a35b Mon Sep 17 00:00:00 2001 From: Rand01ph Date: Wed, 24 Apr 2019 01:02:32 +0800 Subject: [PATCH 1/2] fix Remove hyperkube short aliases --- cmd/hyperkube/main.go | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/cmd/hyperkube/main.go b/cmd/hyperkube/main.go index 0c54a70993c..76dd396d3c8 100644 --- a/cmd/hyperkube/main.go +++ b/cmd/hyperkube/main.go @@ -87,30 +87,10 @@ func commandFor(basename string, defaultCommand *cobra.Command, commands []func( 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) - // 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 - ret.Aliases = []string{"controller-manager"} - return ret - } - proxy := func() *cobra.Command { - ret := kubeproxy.NewProxyCommand() - // add back some unfortunate aliases that should be removed - ret.Aliases = []string{"proxy"} - return ret - } - scheduler := func() *cobra.Command { - ret := kubescheduler.NewSchedulerCommand() - // add back some unfortunate aliases that should be removed - ret.Aliases = []string{"scheduler"} - return ret - } + apiserver := func() *cobra.Command { return kubeapiserver.NewAPIServerCommand(stopCh) } + controller := func() *cobra.Command { return kubecontrollermanager.NewControllerManagerCommand() } + proxy := func() *cobra.Command { return kubeproxy.NewProxyCommand() } + scheduler := func() *cobra.Command { return kubescheduler.NewSchedulerCommand() } kubectlCmd := func() *cobra.Command { return kubectl.NewDefaultKubectlCommand() } kubelet := func() *cobra.Command { return kubelet.NewKubeletCommand(stopCh) } cloudController := func() *cobra.Command { return cloudcontrollermanager.NewCloudControllerManagerCommand() } From f6bf44a205500eea65b97b36db3029e9e36e4676 Mon Sep 17 00:00:00 2001 From: Rand01ph Date: Tue, 7 May 2019 01:02:01 +0800 Subject: [PATCH 2/2] Remove hyperkube short aliases used in local-up-cluster.sh --- hack/local-up-cluster.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh index 47da3485823..bdccf2527f0 100755 --- a/hack/local-up-cluster.sh +++ b/hack/local-up-cluster.sh @@ -553,7 +553,7 @@ EOF fi APISERVER_LOG=${LOG_DIR}/kube-apiserver.log - ${CONTROLPLANE_SUDO} "${GO_OUT}/hyperkube" apiserver "${authorizer_arg}" "${priv_arg}" ${runtime_config} \ + ${CONTROLPLANE_SUDO} "${GO_OUT}/hyperkube" kube-apiserver "${authorizer_arg}" "${priv_arg}" ${runtime_config} \ ${cloud_config_arg} \ "${advertise_address}" \ "${node_port_range}" \ @@ -631,7 +631,7 @@ function start_controller_manager { fi CTLRMGR_LOG=${LOG_DIR}/kube-controller-manager.log - ${CONTROLPLANE_SUDO} "${GO_OUT}/hyperkube" controller-manager \ + ${CONTROLPLANE_SUDO} "${GO_OUT}/hyperkube" kube-controller-manager \ --v="${LOG_LEVEL}" \ --vmodule="${LOG_SPEC}" \ --service-account-private-key-file="${SERVICE_ACCOUNT_KEY}" \ @@ -825,7 +825,7 @@ EOF fi # shellcheck disable=SC2024 - sudo "${GO_OUT}/hyperkube" proxy \ + sudo "${GO_OUT}/hyperkube" kube-proxy \ --v="${LOG_LEVEL}" \ --config=/tmp/kube-proxy.yaml \ --master="https://${API_HOST}:${API_SECURE_PORT}" >"${PROXY_LOG}" 2>&1 & @@ -835,7 +835,7 @@ EOF function start_kubescheduler { SCHEDULER_LOG=${LOG_DIR}/kube-scheduler.log - ${CONTROLPLANE_SUDO} "${GO_OUT}/hyperkube" scheduler \ + ${CONTROLPLANE_SUDO} "${GO_OUT}/hyperkube" kube-scheduler \ --v="${LOG_LEVEL}" \ --leader-elect=false \ --kubeconfig "${CERT_DIR}"/scheduler.kubeconfig \