github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #41000 from NickrenREN/cloud-controller-manager

Browse Source 
Automatic merge from submit-queue

remove NewCloudNodeController() second return value
This commit is contained in:
Kubernetes Submit Queue 2017-03-25 11:55:21 -07:00 committed by GitHub
commit a5ddb8284e
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/cloud-controller-manager/app/controllermanager.go
View File

@ -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))

4
pkg/controller/cloud/nodecontroller.go
View File

@ -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