From fb27b92a0293384acc00f61beed4055c6346f6a0 Mon Sep 17 00:00:00 2001

From: Jan Chaloupka <jchaloup@redhat.com>

Date: Mon, 17 Jul 2017 08:54:54 +0200

Subject: [PATCH] remove apiserver, add kube-prefix for hyperkube, remove

 federation cmds

---

 cmd/hyperkube/federation-apiserver.go          | 39 --------------------------

 cmd/hyperkube/federation-controller-manager.go | 38 -------------------------

 cmd/hyperkube/kube-controller-manager.go       |  2 +-

 cmd/hyperkube/kube-proxy.go                    |  2 +-

 cmd/hyperkube/kube-scheduler.go                |  2 +-

 cmd/hyperkube/main.go                          |  5 ----

 6 files changed, 3 insertions(+), 85 deletions(-)

 delete mode 100644 cmd/hyperkube/federation-apiserver.go

 delete mode 100644 cmd/hyperkube/federation-controller-manager.go

diff --git a/cmd/hyperkube/federation-apiserver.go b/cmd/hyperkube/federation-apiserver.go

deleted file mode 100644

index 48064d1..0000000

--- a/cmd/hyperkube/federation-apiserver.go

+++ /dev/null

@@ -1,39 +0,0 @@

-/*

-Copyright 2016 The Kubernetes Authors.

-

-Licensed under the Apache License, Version 2.0 (the "License");

-you may not use this file except in compliance with the License.

-You may obtain a copy of the License at

-

-    http://www.apache.org/licenses/LICENSE-2.0

-

-Unless required by applicable law or agreed to in writing, software

-distributed under the License is distributed on an "AS IS" BASIS,

-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-See the License for the specific language governing permissions and

-limitations under the License.

-*/

-

-package main

-

-import (

-	"k8s.io/apimachinery/pkg/util/wait"

-	"k8s.io/kubernetes/federation/cmd/federation-apiserver/app"

-	"k8s.io/kubernetes/federation/cmd/federation-apiserver/app/options"

-)

-

-// NewFederationAPIServer creates a new hyperkube Server object that includes the

-// description and flags.

-func NewFederationAPIServer() *Server {

-	s := options.NewServerRunOptions()

-

-	hks := Server{

-		SimpleUsage: "federation-apiserver",

-		Long:        "The API entrypoint for the federation control plane",

-		Run: func(_ *Server, args []string) error {

-			return app.Run(s, wait.NeverStop)

-		},

-	}

-	s.AddFlags(hks.Flags())

-	return &hks

-}

diff --git a/cmd/hyperkube/federation-controller-manager.go b/cmd/hyperkube/federation-controller-manager.go

deleted file mode 100644

index e445f87..0000000

--- a/cmd/hyperkube/federation-controller-manager.go

+++ /dev/null

@@ -1,38 +0,0 @@

-/*

-Copyright 2016 The Kubernetes Authors.

-

-Licensed under the Apache License, Version 2.0 (the "License");

-you may not use this file except in compliance with the License.

-You may obtain a copy of the License at

-

-    http://www.apache.org/licenses/LICENSE-2.0

-

-Unless required by applicable law or agreed to in writing, software

-distributed under the License is distributed on an "AS IS" BASIS,

-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-See the License for the specific language governing permissions and

-limitations under the License.

-*/

-

-package main

-

-import (

-	"k8s.io/kubernetes/federation/cmd/federation-controller-manager/app"

-	"k8s.io/kubernetes/federation/cmd/federation-controller-manager/app/options"

-)

-

-// NewFederationCMServer creates a new hyperkube Server object that includes the

-// description and flags.

-func NewFederationCMServer() *Server {

-	s := options.NewCMServer()

-

-	hks := Server{

-		SimpleUsage: "federation-controller-manager",

-		Long:        "Controller manager for federation control plane. Manages federation service endpoints and controllers",

-		Run: func(_ *Server, args []string) error {

-			return app.Run(s)

-		},

-	}

-	s.AddFlags(hks.Flags())

-	return &hks

-}

diff --git a/cmd/hyperkube/kube-controller-manager.go b/cmd/hyperkube/kube-controller-manager.go

index 35061e9..e6ba736 100644

--- a/cmd/hyperkube/kube-controller-manager.go

+++ b/cmd/hyperkube/kube-controller-manager.go

@@ -27,7 +27,7 @@ func NewKubeControllerManager() *Server {

 	s := options.NewCMServer()

 	hks := Server{

-		name:            "controller-manager",

+		name:            "kube-controller-manager",

 		AlternativeName: "kube-controller-manager",

 		SimpleUsage:     "controller-manager",

 		Long:            "A server that runs a set of active components. This includes replication controllers, service endpoints and nodes.",

diff --git a/cmd/hyperkube/kube-proxy.go b/cmd/hyperkube/kube-proxy.go

index 76bc2dc..a3fa3fe 100644

--- a/cmd/hyperkube/kube-proxy.go

+++ b/cmd/hyperkube/kube-proxy.go

@@ -31,7 +31,7 @@ func NewKubeProxy() *Server {

 	command := app.NewProxyCommand()

 	hks := Server{

-		name:            "proxy",

+		name:            "kube-proxy",

 		AlternativeName: "kube-proxy",

 		SimpleUsage:     "proxy",

 		Long:            command.Long,

diff --git a/cmd/hyperkube/kube-scheduler.go b/cmd/hyperkube/kube-scheduler.go

index fd00103..33a918d 100644

--- a/cmd/hyperkube/kube-scheduler.go

+++ b/cmd/hyperkube/kube-scheduler.go

@@ -27,7 +27,7 @@ func NewScheduler() *Server {

 	s := options.NewSchedulerServer()

 	hks := Server{

-		name:            "scheduler",

+		name:            "kube-scheduler",

 		AlternativeName: "kube-scheduler",

 		SimpleUsage:     "scheduler",

 		Long:            "Implements a Kubernetes scheduler.  This will assign pods to kubelets based on capacity and constraints.",

diff --git a/cmd/hyperkube/main.go b/cmd/hyperkube/main.go

index e1e07b7..f44ae68 100644

--- a/cmd/hyperkube/main.go

+++ b/cmd/hyperkube/main.go

@@ -33,16 +33,11 @@ func main() {

 	}

 	hk.AddServer(NewKubectlServer())

-	hk.AddServer(NewKubeAPIServer())

 	hk.AddServer(NewKubeControllerManager())

 	hk.AddServer(NewScheduler())

 	hk.AddServer(NewKubelet())

 	hk.AddServer(NewKubeProxy())

 	hk.AddServer(NewKubeAggregator())

-	//Federation servers

-	hk.AddServer(NewFederationAPIServer())

-	hk.AddServer(NewFederationCMServer())

-

 	hk.RunToExit(os.Args)

 }

-- 

2.7.5