add --controllers to controller manager

2017-01-10 15:11:25 -05:00
parent 199af05cd0
commit d9b75ed82b
9 changed files with 184 additions and 4 deletions
--- a/cmd/hyperkube/kube-controller-manager.go
+++ b/cmd/hyperkube/kube-controller-manager.go
@@ -33,6 +33,6 @@ func NewKubeControllerManager() *Server {
 			return app.Run(s)
 		},
 	}
-	s.AddFlags(hks.Flags())
+	s.AddFlags(hks.Flags(), app.KnownControllers(), app.ControllersDisabledByDefault.List())
 	return &hks
 }