|
 |
41acee |
From 3b2333bac86397a7d913f62e912a953fa548582d Mon Sep 17 00:00:00 2001
|
|
|
55f026 |
From: Jan Chaloupka <jchaloup@redhat.com>
|
|
|
41acee |
Date: Mon, 12 Dec 2016 17:12:58 +0100
|
|
|
55f026 |
Subject: [PATCH] Hyperkube: remove federation cmds
|
|
|
55f026 |
|
|
|
55f026 |
---
|
|
|
55f026 |
cmd/hyperkube/federation-apiserver.go | 38 --------------------------
|
|
|
55f026 |
cmd/hyperkube/federation-controller-manager.go | 38 --------------------------
|
|
|
55f026 |
cmd/hyperkube/main.go | 4 ---
|
|
|
55f026 |
3 files changed, 80 deletions(-)
|
|
|
55f026 |
delete mode 100644 cmd/hyperkube/federation-apiserver.go
|
|
|
55f026 |
delete mode 100644 cmd/hyperkube/federation-controller-manager.go
|
|
|
55f026 |
|
|
|
55f026 |
diff --git a/cmd/hyperkube/federation-apiserver.go b/cmd/hyperkube/federation-apiserver.go
|
|
|
55f026 |
deleted file mode 100644
|
|
|
41acee |
index 25c0f20..0000000
|
|
|
55f026 |
--- a/cmd/hyperkube/federation-apiserver.go
|
|
|
55f026 |
+++ /dev/null
|
|
|
55f026 |
@@ -1,38 +0,0 @@
|
|
|
55f026 |
-/*
|
|
|
41acee |
-Copyright 2016 The Kubernetes Authors.
|
|
|
55f026 |
-
|
|
|
55f026 |
-Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
55f026 |
-you may not use this file except in compliance with the License.
|
|
|
55f026 |
-You may obtain a copy of the License at
|
|
|
55f026 |
-
|
|
|
55f026 |
- http://www.apache.org/licenses/LICENSE-2.0
|
|
|
55f026 |
-
|
|
|
55f026 |
-Unless required by applicable law or agreed to in writing, software
|
|
|
55f026 |
-distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
55f026 |
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
55f026 |
-See the License for the specific language governing permissions and
|
|
|
55f026 |
-limitations under the License.
|
|
|
55f026 |
-*/
|
|
|
55f026 |
-
|
|
|
55f026 |
-package main
|
|
|
55f026 |
-
|
|
|
55f026 |
-import (
|
|
|
55f026 |
- "k8s.io/kubernetes/federation/cmd/federation-apiserver/app"
|
|
|
41acee |
- "k8s.io/kubernetes/federation/cmd/federation-apiserver/app/options"
|
|
|
55f026 |
-)
|
|
|
55f026 |
-
|
|
|
55f026 |
-// NewFederationAPIServer creates a new hyperkube Server object that includes the
|
|
|
55f026 |
-// description and flags.
|
|
|
55f026 |
-func NewFederationAPIServer() *Server {
|
|
|
41acee |
- s := options.NewServerRunOptions()
|
|
|
55f026 |
-
|
|
|
55f026 |
- hks := Server{
|
|
|
55f026 |
- SimpleUsage: "federation-apiserver",
|
|
|
55f026 |
- Long: "The API entrypoint for the federation control plane",
|
|
|
55f026 |
- Run: func(_ *Server, args []string) error {
|
|
|
55f026 |
- return app.Run(s)
|
|
|
55f026 |
- },
|
|
|
55f026 |
- }
|
|
|
55f026 |
- s.AddFlags(hks.Flags())
|
|
|
55f026 |
- return &hks
|
|
|
55f026 |
-}
|
|
|
55f026 |
diff --git a/cmd/hyperkube/federation-controller-manager.go b/cmd/hyperkube/federation-controller-manager.go
|
|
|
55f026 |
deleted file mode 100644
|
|
|
41acee |
index e445f87..0000000
|
|
|
55f026 |
--- a/cmd/hyperkube/federation-controller-manager.go
|
|
|
55f026 |
+++ /dev/null
|
|
|
55f026 |
@@ -1,38 +0,0 @@
|
|
|
55f026 |
-/*
|
|
|
41acee |
-Copyright 2016 The Kubernetes Authors.
|
|
|
55f026 |
-
|
|
|
55f026 |
-Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
55f026 |
-you may not use this file except in compliance with the License.
|
|
|
55f026 |
-You may obtain a copy of the License at
|
|
|
55f026 |
-
|
|
|
55f026 |
- http://www.apache.org/licenses/LICENSE-2.0
|
|
|
55f026 |
-
|
|
|
55f026 |
-Unless required by applicable law or agreed to in writing, software
|
|
|
55f026 |
-distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
55f026 |
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
55f026 |
-See the License for the specific language governing permissions and
|
|
|
55f026 |
-limitations under the License.
|
|
|
55f026 |
-*/
|
|
|
55f026 |
-
|
|
|
55f026 |
-package main
|
|
|
55f026 |
-
|
|
|
55f026 |
-import (
|
|
|
55f026 |
- "k8s.io/kubernetes/federation/cmd/federation-controller-manager/app"
|
|
|
55f026 |
- "k8s.io/kubernetes/federation/cmd/federation-controller-manager/app/options"
|
|
|
55f026 |
-)
|
|
|
55f026 |
-
|
|
|
55f026 |
-// NewFederationCMServer creates a new hyperkube Server object that includes the
|
|
|
55f026 |
-// description and flags.
|
|
|
55f026 |
-func NewFederationCMServer() *Server {
|
|
|
55f026 |
- s := options.NewCMServer()
|
|
|
55f026 |
-
|
|
|
55f026 |
- hks := Server{
|
|
|
55f026 |
- SimpleUsage: "federation-controller-manager",
|
|
|
55f026 |
- Long: "Controller manager for federation control plane. Manages federation service endpoints and controllers",
|
|
|
55f026 |
- Run: func(_ *Server, args []string) error {
|
|
|
55f026 |
- return app.Run(s)
|
|
|
55f026 |
- },
|
|
|
55f026 |
- }
|
|
|
55f026 |
- s.AddFlags(hks.Flags())
|
|
|
55f026 |
- return &hks
|
|
|
55f026 |
-}
|
|
|
55f026 |
diff --git a/cmd/hyperkube/main.go b/cmd/hyperkube/main.go
|
|
|
41acee |
index df6d239..998c099 100644
|
|
|
55f026 |
--- a/cmd/hyperkube/main.go
|
|
|
55f026 |
+++ b/cmd/hyperkube/main.go
|
|
|
41acee |
@@ -41,9 +41,5 @@ func main() {
|
|
|
55f026 |
hk.AddServer(NewKubelet())
|
|
|
55f026 |
hk.AddServer(NewKubeProxy())
|
|
|
55f026 |
|
|
|
55f026 |
- //Federation servers
|
|
|
55f026 |
- hk.AddServer(NewFederationAPIServer())
|
|
|
55f026 |
- hk.AddServer(NewFederationCMServer())
|
|
|
55f026 |
-
|
|
|
55f026 |
hk.RunToExit(os.Args)
|
|
|
55f026 |
}
|
|
|
55f026 |
--
|
|
|
41acee |
2.7.4
|
|
|
55f026 |
|