From 08eff774c139117b827b39799e3be74de8040994 Mon Sep 17 00:00:00 2001
From: David Eads <deads@redhat.com>
Date: Thu, 7 Dec 2017 10:54:12 -0500
Subject: [PATCH] UPSTREAM: <drop>: stop adding federation to hyperkube one
 release early

---
 .../cmd/hyperkube/federation-apiserver.go     | 39 -------------------
 .../federation-controller-manager.go          | 38 ------------------
 .../k8s.io/kubernetes/cmd/hyperkube/main.go   |  4 --
 3 files changed, 81 deletions(-)
 delete mode 100644 vendor/k8s.io/kubernetes/cmd/hyperkube/federation-apiserver.go
 delete mode 100644 vendor/k8s.io/kubernetes/cmd/hyperkube/federation-controller-manager.go

diff --git a/vendor/k8s.io/kubernetes/cmd/hyperkube/federation-apiserver.go b/vendor/k8s.io/kubernetes/cmd/hyperkube/federation-apiserver.go
deleted file mode 100644
index 97dff0413969..000000000000
--- a/vendor/k8s.io/kubernetes/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/vendor/k8s.io/kubernetes/cmd/hyperkube/federation-controller-manager.go b/vendor/k8s.io/kubernetes/cmd/hyperkube/federation-controller-manager.go
deleted file mode 100644
index b702a1e34cbd..000000000000
--- a/vendor/k8s.io/kubernetes/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/vendor/k8s.io/kubernetes/cmd/hyperkube/main.go b/vendor/k8s.io/kubernetes/cmd/hyperkube/main.go
index ef49d067508c..de5b58fca12a 100644
--- a/vendor/k8s.io/kubernetes/cmd/hyperkube/main.go
+++ b/vendor/k8s.io/kubernetes/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)
 }