github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Revert the changes to cmd/hypercube

Browse Source
This commit is contained in:
Dr. Stefan Schimanski 2015-07-31 20:33:44 +02:00
parent 76dc61bcfb
commit 9f73dbbf9e
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/hyperkube/kube-proxy.go
View File

@ -20,7 +20,6 @@ package main
import ( import (
kubeproxy "github.com/GoogleCloudPlatform/kubernetes/cmd/kube-proxy/app" 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 // NewKubeProxy creates a new hyperkube Server object that includes the
@ -29,7 +28,7 @@ func NewKubeProxy() *Server {
s := kubeproxy.NewProxyServer() s := kubeproxy.NewProxyServer()
hks := Server{ hks := Server{
SimpleUsage: hyperkube.CommandProxy, SimpleUsage: "proxy",
Long: `The Kubernetes proxy server is responsible for taking traffic directed at Long: `The Kubernetes proxy server is responsible for taking traffic directed at
services and forwarding it to the appropriate pods. It generally runs on 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. nodes next to the Kubelet and proxies traffic from local pods to remote pods.

3
cmd/hyperkube/kube-scheduler.go
View File

@ -19,7 +19,6 @@ limitations under the License.
package main package main
import ( import (
"github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/hyperkube"
scheduler "github.com/GoogleCloudPlatform/kubernetes/plugin/cmd/kube-scheduler/app" scheduler "github.com/GoogleCloudPlatform/kubernetes/plugin/cmd/kube-scheduler/app"
) )
@ -29,7 +28,7 @@ func NewScheduler() *Server {
s := scheduler.NewSchedulerServer() s := scheduler.NewSchedulerServer()
hks := Server{ hks := Server{
SimpleUsage: hyperkube.CommandScheduler, SimpleUsage: "scheduler",
Long: "Implements a Kubernetes scheduler. This will assign pods to kubelets based on capacity and constraints.", Long: "Implements a Kubernetes scheduler. This will assign pods to kubelets based on capacity and constraints.",
Run: func(_ *Server, args []string) error { Run: func(_ *Server, args []string) error {
return s.Run(args) return s.Run(args)