github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Turn flannel off by default

Browse Source
This commit is contained in:
Prashanth Balasubramanian
2015-11-23 18:11:51 -08:00
committed by gmarek
parent ad2d3d4c20
commit 9aa0efa393
14 changed files with 83 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/kube-controller-manager/app/controllermanager.go
View File

@@ -292,8 +292,7 @@ func (s *CMServer) Run(_ []string) error {
}
if s.AllocateNodeCIDRs {
// TODO: Pipe this as a command line flag that corresponds to overlay==true
if cloud == nil || true {
if cloud == nil {
glog.Warning("allocate-node-cidrs is set, but no cloud provider specified. Will not manage routes.")
} else if routes, ok := cloud.Routes(); !ok {
glog.Warning("allocate-node-cidrs is set, but cloud provider does not support routes. Will not manage routes.")
@@ -301,6 +300,8 @@ func (s *CMServer) Run(_ []string) error {
routeController := routecontroller.New(routes, kubeClient, s.ClusterName, &s.ClusterCIDR)
routeController.Run(s.NodeSyncPeriod)
}
} else {
glog.Infof("allocate-node-cidrs set to %v, node controller not creating routes", s.AllocateNodeCIDRs)
}
resourcequotacontroller.NewResourceQuotaController(kubeClient).Run(s.ResourceQuotaSyncPeriod)