Merge pull request #27586 from colhom/federation-hyperkube

Automatic merge from submit-queue Add federation api and cm servers to hyperkube \cc @nikhiljindal @quinton-hoole [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
kubernetes · Jun 21, 2016 · 6a7fd05 · 6a7fd05
2 parents 70ad689 + 8b2d1f3
commit 6a7fd05
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 0 deletions.
diff --git a/cmd/hyperkube/federation-apiserver.go b/cmd/hyperkube/federation-apiserver.go
@@ -0,0 +1,38 @@
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+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"
+	genericoptions "k8s.io/kubernetes/pkg/genericapiserver/options"
+)
+
+// NewFederationAPIServer creates a new hyperkube Server object that includes the
+// description and flags.
+func NewFederationAPIServer() *Server {
+	s := genericoptions.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)
+		},
+	}
+	s.AddFlags(hks.Flags())
+	return &hks
+}
diff --git a/cmd/hyperkube/federation-controller-manager.go b/cmd/hyperkube/federation-controller-manager.go
@@ -0,0 +1,38 @@
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+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/main.go b/cmd/hyperkube/main.go
@@ -38,5 +38,9 @@ func main() {
 	hk.AddServer(NewKubelet())
 	hk.AddServer(NewKubeProxy())
 
+	//Federation servers
+	hk.AddServer(NewFederationAPIServer())
+	hk.AddServer(NewFederationCMServer())
+
 	hk.RunToExit(os.Args)
 }