keep hyperkube noise in one place

This commit is contained in:
Tim Hockin
2015-02-07 14:20:00 -08:00
parent 899d30f16a
commit cb09571768
3 changed files with 39 additions and 19 deletions

View File

@@ -21,7 +21,6 @@ package main
import (
"os"
apiserver "github.com/GoogleCloudPlatform/kubernetes/cmd/kube-apiserver/app"
"github.com/GoogleCloudPlatform/kubernetes/pkg/controllermanager"
"github.com/GoogleCloudPlatform/kubernetes/pkg/hyperkube"
sched "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/server"
@@ -33,7 +32,7 @@ func main() {
Long: "This is an all-in-one binary that can run any of the various Kubernetes servers.",
}
hk.AddServer(apiserver.NewHyperkubeServer())
hk.AddServer(NewKubeAPIServer())
hk.AddServer(controllermanager.NewHyperkubeServer())
hk.AddServer(sched.NewHyperkubeServer())
hk.AddServer(NewKubelet())