From 2f2a5c866d6b2bbe720972d8b11fa8055c1aba0c Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: Mon, 2 Oct 2017 14:20:15 +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/main.go | 4 ---
3 files changed, 81 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 97dff04..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/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, stopCh <-chan struct{}) error {
- return app.Run(s, stopCh)
- },
- RespectsStopCh: true,
- }
- 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 b702a1e..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, stopCh <-chan struct{}) error {
- return app.Run(s)
- },
- }
- s.AddFlags(hks.Flags())
- return &hks
-}
diff --git a/cmd/hyperkube/main.go b/cmd/hyperkube/main.go
index ef49d06..de5b58f 100644
--- a/cmd/hyperkube/main.go
+++ b/cmd/hyperkube/main.go
@@ -46,9 +46,5 @@ func main() {
hk.AddServer(NewKubeProxy())
hk.AddServer(NewKubeAggregator())
- //Federation servers
- hk.AddServer(NewFederationAPIServer())
- hk.AddServer(NewFederationCMServer())
-
hk.RunToExit(os.Args)
}
--
2.7.5