|
 |
cbb2ea |
From 9e1554c9b74b2976e0e93d9f34bab82297313419 Mon Sep 17 00:00:00 2001
|
|
|
38ffc8 |
From: Jan Chaloupka <jchaloup@redhat.com>
|
|
|
cbb2ea |
Date: Fri, 15 Apr 2016 15:06:40 +0200
|
|
|
38ffc8 |
Subject: [PATCH] remove apiserver, backport kubectl, add kube-prefix for
|
|
|
38ffc8 |
|
|
|
38ffc8 |
---
|
|
|
cbb2ea |
cmd/hyperkube/kube-controller-manager.go | 2 +-
|
|
|
cbb2ea |
cmd/hyperkube/kube-proxy.go | 2 +-
|
|
|
cbb2ea |
cmd/hyperkube/kube-scheduler.go | 2 +-
|
|
|
cbb2ea |
cmd/hyperkube/main.go | 1 -
|
|
|
cbb2ea |
4 files changed, 3 insertions(+), 4 deletions(-)
|
|
|
38ffc8 |
|
|
|
38ffc8 |
diff --git a/cmd/hyperkube/kube-controller-manager.go b/cmd/hyperkube/kube-controller-manager.go
|
|
|
cbb2ea |
index 57d4856..1fc5107 100644
|
|
|
38ffc8 |
--- a/cmd/hyperkube/kube-controller-manager.go
|
|
|
38ffc8 |
+++ b/cmd/hyperkube/kube-controller-manager.go
|
|
|
cbb2ea |
@@ -29,7 +29,7 @@ func NewKubeControllerManager() *Server {
|
|
|
cbb2ea |
s := options.NewCMServer()
|
|
|
38ffc8 |
|
|
|
38ffc8 |
hks := Server{
|
|
|
38ffc8 |
- SimpleUsage: "controller-manager",
|
|
|
38ffc8 |
+ SimpleUsage: "kube-controller-manager",
|
|
|
38ffc8 |
Long: "A server that runs a set of active components. This includes replication controllers, service endpoints and nodes.",
|
|
|
38ffc8 |
Run: func(_ *Server, args []string) error {
|
|
|
cbb2ea |
return app.Run(s)
|
|
|
38ffc8 |
diff --git a/cmd/hyperkube/kube-proxy.go b/cmd/hyperkube/kube-proxy.go
|
|
|
cbb2ea |
index 5b5231d..9580074 100644
|
|
|
38ffc8 |
--- a/cmd/hyperkube/kube-proxy.go
|
|
|
38ffc8 |
+++ b/cmd/hyperkube/kube-proxy.go
|
|
|
cbb2ea |
@@ -34,7 +34,7 @@ func NewKubeProxy() *Server {
|
|
|
cbb2ea |
config := options.NewProxyConfig()
|
|
|
38ffc8 |
|
|
|
38ffc8 |
hks := Server{
|
|
|
38ffc8 |
- SimpleUsage: "proxy",
|
|
|
38ffc8 |
+ SimpleUsage: "kube-proxy",
|
|
|
38ffc8 |
Long: `The Kubernetes proxy server is responsible for taking traffic directed at
|
|
|
38ffc8 |
services and forwarding it to the appropriate pods. It generally runs on
|
|
|
38ffc8 |
nodes next to the Kubelet and proxies traffic from local pods to remote pods.
|
|
|
38ffc8 |
diff --git a/cmd/hyperkube/kube-scheduler.go b/cmd/hyperkube/kube-scheduler.go
|
|
|
cbb2ea |
index 799038d..4be08e1 100644
|
|
|
38ffc8 |
--- a/cmd/hyperkube/kube-scheduler.go
|
|
|
38ffc8 |
+++ b/cmd/hyperkube/kube-scheduler.go
|
|
|
cbb2ea |
@@ -29,7 +29,7 @@ func NewScheduler() *Server {
|
|
|
cbb2ea |
s := options.NewSchedulerServer()
|
|
|
38ffc8 |
|
|
|
38ffc8 |
hks := Server{
|
|
|
38ffc8 |
- SimpleUsage: "scheduler",
|
|
|
38ffc8 |
+ SimpleUsage: "kube-scheduler",
|
|
|
38ffc8 |
Long: "Implements a Kubernetes scheduler. This will assign pods to kubelets based on capacity and constraints.",
|
|
|
cbb2ea |
Run: func(_ *Server, _ []string) error {
|
|
|
cbb2ea |
return app.Run(s)
|
|
|
38ffc8 |
diff --git a/cmd/hyperkube/main.go b/cmd/hyperkube/main.go
|
|
|
cbb2ea |
index 4d9c499..8b060ba 100644
|
|
|
38ffc8 |
--- a/cmd/hyperkube/main.go
|
|
|
38ffc8 |
+++ b/cmd/hyperkube/main.go
|
|
|
cbb2ea |
@@ -32,7 +32,6 @@ func main() {
|
|
|
38ffc8 |
}
|
|
|
38ffc8 |
|
|
|
cbb2ea |
hk.AddServer(NewKubectlServer())
|
|
|
38ffc8 |
- hk.AddServer(NewKubeAPIServer())
|
|
|
38ffc8 |
hk.AddServer(NewKubeControllerManager())
|
|
|
38ffc8 |
hk.AddServer(NewScheduler())
|
|
|
38ffc8 |
hk.AddServer(NewKubelet())
|
|
|
38ffc8 |
--
|
|
|
38ffc8 |
1.9.3
|
|
|
38ffc8 |
|