move pkg/controllermanager to cmd/kube-controller-manager/app

2015-02-07 20:07:00 -08:00
parent cb09571768
commit 0b17c0f225
5 changed files with 44 additions and 24 deletions
--- a/cmd/hyperkube/hyperkube.go
+++ b/cmd/hyperkube/hyperkube.go
@@ -21,7 +21,6 @@ package main
 import (
 	"os"

-	"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() {
 	}

 	hk.AddServer(NewKubeAPIServer())
-	hk.AddServer(controllermanager.NewHyperkubeServer())
+	hk.AddServer(NewKubeControllerManager())
 	hk.AddServer(sched.NewHyperkubeServer())
 	hk.AddServer(NewKubelet())
 	hk.AddServer(NewKubeProxy())