keep hyperkube noise in one place

This commit is contained in:
Tim Hockin
2015-02-07 14:01:54 -08:00
parent 8c2ff81ae0
commit 0a7b89cc00
3 changed files with 42 additions and 22 deletions

View File

@@ -21,7 +21,6 @@ package main
import (
"os"
proxy "github.com/GoogleCloudPlatform/kubernetes/cmd/kube-proxy/app"
"github.com/GoogleCloudPlatform/kubernetes/pkg/controllermanager"
"github.com/GoogleCloudPlatform/kubernetes/pkg/hyperkube"
apiserver "github.com/GoogleCloudPlatform/kubernetes/pkg/master/server"
@@ -38,7 +37,7 @@ func main() {
hk.AddServer(controllermanager.NewHyperkubeServer())
hk.AddServer(sched.NewHyperkubeServer())
hk.AddServer(NewKubelet())
hk.AddServer(proxy.NewHyperkubeServer())
hk.AddServer(NewKubeProxy())
hk.RunToExit(os.Args)
}