mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-24 03:35:38 +03:00
66 lines
2.5 KiB
Diff
66 lines
2.5 KiB
Diff
From f8748053d34c651230fbc317e25d74d404548c66 Mon Sep 17 00:00:00 2001
|
|
From: Jan Chaloupka <jchaloup@redhat.com>
|
|
Date: Fri, 26 Feb 2016 16:17:24 +0100
|
|
Subject: [PATCH] remove apiserver, add kube-prefix for hyperkube
|
|
|
|
---
|
|
cmd/hyperkube/kube-controller-manager.go | 2 +-
|
|
cmd/hyperkube/kube-proxy.go | 2 +-
|
|
cmd/hyperkube/kube-scheduler.go | 2 +-
|
|
cmd/hyperkube/main.go | 1 -
|
|
4 files changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/cmd/hyperkube/kube-controller-manager.go b/cmd/hyperkube/kube-controller-manager.go
|
|
index 57d4856..1fc5107 100644
|
|
--- a/cmd/hyperkube/kube-controller-manager.go
|
|
+++ b/cmd/hyperkube/kube-controller-manager.go
|
|
@@ -29,7 +29,7 @@ func NewKubeControllerManager() *Server {
|
|
s := options.NewCMServer()
|
|
|
|
hks := Server{
|
|
- SimpleUsage: "controller-manager",
|
|
+ SimpleUsage: "kube-controller-manager",
|
|
Long: "A server that runs a set of active components. This includes replication controllers, service endpoints and nodes.",
|
|
Run: func(_ *Server, args []string) error {
|
|
return app.Run(s)
|
|
diff --git a/cmd/hyperkube/kube-proxy.go b/cmd/hyperkube/kube-proxy.go
|
|
index 2f8678d..0a010d8 100644
|
|
--- a/cmd/hyperkube/kube-proxy.go
|
|
+++ b/cmd/hyperkube/kube-proxy.go
|
|
@@ -29,7 +29,7 @@ func NewKubeProxy() *Server {
|
|
config := options.NewProxyConfig()
|
|
|
|
hks := Server{
|
|
- SimpleUsage: "proxy",
|
|
+ SimpleUsage: "kube-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 799038d..4be08e1 100644
|
|
--- a/cmd/hyperkube/kube-scheduler.go
|
|
+++ b/cmd/hyperkube/kube-scheduler.go
|
|
@@ -29,7 +29,7 @@ func NewScheduler() *Server {
|
|
s := options.NewSchedulerServer()
|
|
|
|
hks := Server{
|
|
- SimpleUsage: "scheduler",
|
|
+ SimpleUsage: "kube-scheduler",
|
|
Long: "Implements a Kubernetes scheduler. This will assign pods to kubelets based on capacity and constraints.",
|
|
Run: func(_ *Server, _ []string) error {
|
|
return app.Run(s)
|
|
diff --git a/cmd/hyperkube/main.go b/cmd/hyperkube/main.go
|
|
index 4d9c499..8b060ba 100644
|
|
--- a/cmd/hyperkube/main.go
|
|
+++ b/cmd/hyperkube/main.go
|
|
@@ -32,7 +32,6 @@ func main() {
|
|
}
|
|
|
|
hk.AddServer(NewKubectlServer())
|
|
- hk.AddServer(NewKubeAPIServer())
|
|
hk.AddServer(NewKubeControllerManager())
|
|
hk.AddServer(NewScheduler())
|
|
hk.AddServer(NewKubelet())
|
|
--
|
|
1.9.3
|
|
|