diff --git a/cmd/cloud-controller-manager/app/controllermanager.go b/cmd/cloud-controller-manager/app/controllermanager.go index e17489f755d..ce40aa3d591 100644 --- a/cmd/cloud-controller-manager/app/controllermanager.go +++ b/cmd/cloud-controller-manager/app/controllermanager.go @@ -208,13 +208,11 @@ func StartControllers(s *options.CloudControllerManagerServer, kubeconfig *restc } // Start the CloudNodeController - nodeController, err := nodecontroller.NewCloudNodeController( + nodeController := nodecontroller.NewCloudNodeController( sharedInformers.Core().V1().Nodes(), client("cloud-node-controller"), cloud, s.NodeMonitorPeriod.Duration) - if err != nil { - glog.Fatalf("Failed to initialize nodecontroller: %v", err) - } + nodeController.Run() time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter)) diff --git a/pkg/controller/cloud/nodecontroller.go b/pkg/controller/cloud/nodecontroller.go index 58e7a102125..049f12cfc65 100644 --- a/pkg/controller/cloud/nodecontroller.go +++ b/pkg/controller/cloud/nodecontroller.go @@ -62,7 +62,7 @@ func NewCloudNodeController( nodeInformer coreinformers.NodeInformer, kubeClient clientset.Interface, cloud cloudprovider.Interface, - nodeMonitorPeriod time.Duration) (*CloudNodeController, error) { + nodeMonitorPeriod time.Duration) *CloudNodeController { eventBroadcaster := record.NewBroadcaster() recorder := eventBroadcaster.NewRecorder(api.Scheme, clientv1.EventSource{Component: "cloudcontrollermanager"}) @@ -81,7 +81,7 @@ func NewCloudNodeController( cloud: cloud, nodeMonitorPeriod: nodeMonitorPeriod, } - return cnc, nil + return cnc } // This controller deletes a node if kubelet is not reporting