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

This commit is contained in:
Tim Hockin
2015-02-07 20:07:00 -08:00
parent cb09571768
commit 0b17c0f225
5 changed files with 44 additions and 24 deletions

View File

@@ -25,7 +25,7 @@ import (
"os"
"runtime"
"github.com/GoogleCloudPlatform/kubernetes/pkg/controllermanager"
"github.com/GoogleCloudPlatform/kubernetes/cmd/kube-controller-manager/app"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"github.com/GoogleCloudPlatform/kubernetes/pkg/version/verflag"
@@ -34,7 +34,7 @@ import (
func main() {
runtime.GOMAXPROCS(runtime.NumCPU())
s := controllermanager.NewCMServer()
s := app.NewCMServer()
s.AddFlags(pflag.CommandLine)
util.InitFlags()