From df2a1e50e3e272979a47a73313c821c41a9cd06c Mon Sep 17 00:00:00 2001 From: allencloud Date: Tue, 25 Jul 2017 16:21:48 +0800 Subject: [PATCH] use demorgans to make startRouteController implementation more readable Signed-off-by: allencloud --- cmd/kube-controller-manager/app/core.go | 27 ++++++++++++------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/cmd/kube-controller-manager/app/core.go b/cmd/kube-controller-manager/app/core.go index 0fe3489692f..a47ab8294b4 100644 --- a/cmd/kube-controller-manager/app/core.go +++ b/cmd/kube-controller-manager/app/core.go @@ -124,23 +124,22 @@ func startRouteController(ctx ControllerContext) (bool, error) { if err != nil { glog.Warningf("Unsuccessful parsing of cluster CIDR %v: %v", ctx.Options.ClusterCIDR, err) } - // TODO demorgans - if ctx.Options.AllocateNodeCIDRs && ctx.Options.ConfigureCloudRoutes { - if ctx.Cloud == nil { - glog.Warning("configure-cloud-routes is set, but no cloud provider specified. Will not configure cloud provider routes.") - return false, nil - } else if routes, ok := ctx.Cloud.Routes(); !ok { - glog.Warning("configure-cloud-routes is set, but cloud provider does not support routes. Will not configure cloud provider routes.") - return false, nil - } else { - routeController := routecontroller.New(routes, ctx.ClientBuilder.ClientOrDie("route-controller"), ctx.InformerFactory.Core().V1().Nodes(), ctx.Options.ClusterName, clusterCIDR) - go routeController.Run(ctx.Stop, ctx.Options.RouteReconciliationPeriod.Duration) - return true, nil - } - } else { + if !ctx.Options.AllocateNodeCIDRs || !ctx.Options.ConfigureCloudRoutes { glog.Infof("Will not configure cloud provider routes for allocate-node-cidrs: %v, configure-cloud-routes: %v.", ctx.Options.AllocateNodeCIDRs, ctx.Options.ConfigureCloudRoutes) return false, nil } + if ctx.Cloud == nil { + glog.Warning("configure-cloud-routes is set, but no cloud provider specified. Will not configure cloud provider routes.") + return false, nil + } + routes, ok := ctx.Cloud.Routes() + if !ok { + glog.Warning("configure-cloud-routes is set, but cloud provider does not support routes. Will not configure cloud provider routes.") + return false, nil + } + routeController := routecontroller.New(routes, ctx.ClientBuilder.ClientOrDie("route-controller"), ctx.InformerFactory.Core().V1().Nodes(), ctx.Options.ClusterName, clusterCIDR) + go routeController.Run(ctx.Stop, ctx.Options.RouteReconciliationPeriod.Duration) + return true, nil } func startPersistentVolumeBinderController(ctx ControllerContext) (bool, error) {