Convert controller-manager to hyperkube.

2015-01-30 15:31:36 -08:00
parent 9a867f8311
commit bbb4479166
5 changed files with 192 additions and 98 deletions
--- a/cmd/hyperkube/hyperkube.go
+++ b/cmd/hyperkube/hyperkube.go
@@ -21,6 +21,7 @@ package main
 import (
 	"os"

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/controllermanager"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/hyperkube"
 	apiserver "github.com/GoogleCloudPlatform/kubernetes/pkg/master/server"
 )
@@ -32,6 +33,7 @@ func main() {
 	}

 	hk.AddServer(apiserver.NewHyperkubeServer())
+	hk.AddServer(controllermanager.NewHyperkubeServer())

 	hk.RunToExit(os.Args)
 }