get rid of pkg/hyperkube

This commit is contained in:
Tim Hockin
2015-02-07 20:35:02 -08:00
parent 5f021cfc3e
commit f2894576c1
10 changed files with 227 additions and 237 deletions

View File

@@ -17,19 +17,18 @@ 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 {
func NewScheduler() *Server {
s := scheduler.NewSchedulerServer()
hks := hyperkube.Server{
hks := 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 {
Run: func(_ *Server, args []string) error {
return s.Run(args)
},
}