From 9f73dbbf9e8f6209fb185a5480708a28b801cd17 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Fri, 31 Jul 2015 20:33:44 +0200 Subject: [PATCH] Revert the changes to cmd/hypercube --- cmd/hyperkube/kube-proxy.go | 3 +-- cmd/hyperkube/kube-scheduler.go | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cmd/hyperkube/kube-proxy.go b/cmd/hyperkube/kube-proxy.go index 460e3403171..ffaa1a54c13 100644 --- a/cmd/hyperkube/kube-proxy.go +++ b/cmd/hyperkube/kube-proxy.go @@ -20,7 +20,6 @@ package main import ( kubeproxy "github.com/GoogleCloudPlatform/kubernetes/cmd/kube-proxy/app" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/hyperkube" ) // NewKubeProxy creates a new hyperkube Server object that includes the @@ -29,7 +28,7 @@ func NewKubeProxy() *Server { s := kubeproxy.NewProxyServer() hks := Server{ - SimpleUsage: hyperkube.CommandProxy, + SimpleUsage: "proxy", Long: `The Kubernetes proxy server is responsible for taking traffic directed at services and forwarding it to the appropriate pods. It generally runs on nodes next to the Kubelet and proxies traffic from local pods to remote pods. diff --git a/cmd/hyperkube/kube-scheduler.go b/cmd/hyperkube/kube-scheduler.go index 2e9f0316e2b..ededc4ed8ae 100644 --- a/cmd/hyperkube/kube-scheduler.go +++ b/cmd/hyperkube/kube-scheduler.go @@ -19,7 +19,6 @@ limitations under the License. package main import ( - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/hyperkube" scheduler "github.com/GoogleCloudPlatform/kubernetes/plugin/cmd/kube-scheduler/app" ) @@ -29,7 +28,7 @@ func NewScheduler() *Server { s := scheduler.NewSchedulerServer() hks := Server{ - SimpleUsage: hyperkube.CommandScheduler, + SimpleUsage: "scheduler", Long: "Implements a Kubernetes scheduler. This will assign pods to kubelets based on capacity and constraints.", Run: func(_ *Server, args []string) error { return s.Run(args)