From 5f021cfc3e424c73b82064829f650f84d7abbccd Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Sat, 7 Feb 2015 20:16:29 -0800
Subject: [PATCH] move pkg/scheduler/server to cmd/kube-scheduler/app

---
 cmd/hyperkube/hyperkube.go                    |  3 +-
 cmd/hyperkube/kube-scheduler.go               | 38 +++++++++++++++++++
 .../kube-scheduler/app}/server.go             | 21 +---------
 plugin/cmd/kube-scheduler/scheduler.go        |  4 +-
 4 files changed, 43 insertions(+), 23 deletions(-)
 create mode 100644 cmd/hyperkube/kube-scheduler.go
 rename plugin/{pkg/scheduler/server => cmd/kube-scheduler/app}/server.go (83%)

diff --git a/cmd/hyperkube/hyperkube.go b/cmd/hyperkube/hyperkube.go
index 36a6fc0879d9e..b8ed0ab46fec1 100644
--- a/cmd/hyperkube/hyperkube.go
+++ b/cmd/hyperkube/hyperkube.go
@@ -22,7 +22,6 @@ import (
 	"os"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/hyperkube"
-	sched "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/server"
 )
 
 func main() {
@@ -33,7 +32,7 @@ func main() {
 
 	hk.AddServer(NewKubeAPIServer())
 	hk.AddServer(NewKubeControllerManager())
-	hk.AddServer(sched.NewHyperkubeServer())
+	hk.AddServer(NewScheduler())
 	hk.AddServer(NewKubelet())
 	hk.AddServer(NewKubeProxy())
 
diff --git a/cmd/hyperkube/kube-scheduler.go b/cmd/hyperkube/kube-scheduler.go
new file mode 100644
index 0000000000000..3bf4f491809b1
--- /dev/null
+++ b/cmd/hyperkube/kube-scheduler.go
@@ -0,0 +1,38 @@
+/*
+Copyright 2015 Google Inc. 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 (
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/hyperkube"
+	scheduler "github.com/GoogleCloudPlatform/kubernetes/plugin/cmd/kube-scheduler/app"
+)
+
+// NewScheduler creates a new hyperkube Server object that includes the
+// description and flags.
+func NewScheduler() *hyperkube.Server {
+	s := scheduler.NewSchedulerServer()
+
+	hks := hyperkube.Server{
+		SimpleUsage: "scheduler",
+		Long:        "Implements a Kubernetes scheduler.  This will assign pods to kubelets based on capacity and constraints.",
+		Run: func(_ *hyperkube.Server, args []string) error {
+			return s.Run(args)
+		},
+	}
+	s.AddFlags(hks.Flags())
+	return &hks
+}
diff --git a/plugin/pkg/scheduler/server/server.go b/plugin/cmd/kube-scheduler/app/server.go
similarity index 83%
rename from plugin/pkg/scheduler/server/server.go
rename to plugin/cmd/kube-scheduler/app/server.go
index c1a86c884328c..f65f7100f3d5f 100644
--- a/plugin/pkg/scheduler/server/server.go
+++ b/plugin/cmd/kube-scheduler/app/server.go
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package server implements a Server object for running the scheduler.
-package server
+// Package app implements a Server object for running the scheduler.
+package app
 
 import (
 	"net"
@@ -26,7 +26,6 @@ import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/record"
 	_ "github.com/GoogleCloudPlatform/kubernetes/pkg/healthz"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/hyperkube"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/master/ports"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 	"github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler"
@@ -55,22 +54,6 @@ func NewSchedulerServer() *SchedulerServer {
 	return &s
 }
 
-// NewHyperkubeServer creates a new hyperkube Server object that includes the
-// description and flags.
-func NewHyperkubeServer() *hyperkube.Server {
-	s := NewSchedulerServer()
-
-	hks := hyperkube.Server{
-		SimpleUsage: "scheduler",
-		Long:        "Implements a Kubernetes scheduler.  This will assign pods to kubelets based on capacity and constraints.",
-		Run: func(_ *hyperkube.Server, args []string) error {
-			return s.Run(args)
-		},
-	}
-	s.AddFlags(hks.Flags())
-	return &hks
-}
-
 // AddFlags adds flags for a specific SchedulerServer to the specified FlagSet
 func (s *SchedulerServer) AddFlags(fs *pflag.FlagSet) {
 	fs.IntVar(&s.Port, "port", s.Port, "The port that the scheduler's http service runs on")
diff --git a/plugin/cmd/kube-scheduler/scheduler.go b/plugin/cmd/kube-scheduler/scheduler.go
index 41e90d569402e..eb62343a7e6f6 100644
--- a/plugin/cmd/kube-scheduler/scheduler.go
+++ b/plugin/cmd/kube-scheduler/scheduler.go
@@ -19,13 +19,13 @@ package main
 import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/version/verflag"
-	"github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/server"
+	"github.com/GoogleCloudPlatform/kubernetes/plugin/cmd/kube-scheduler/app"
 
 	"github.com/spf13/pflag"
 )
 
 func main() {
-	s := server.NewSchedulerServer()
+	s := app.NewSchedulerServer()
 	s.AddFlags(pflag.CommandLine)
 
 	util.InitFlags()