github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-16 22:53:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3498 from pravisankar/ravi/sync-nodes-optional

Browse Source 
Make periodic sync nodes from -cloud_provider/-machines optional.
This commit is contained in:
Deyuan Deng
2015-02-09 17:45:56 -05:00
parent 488bf23034 3a5ef05f64
commit f5bc43a46c
7 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/integration/integration.go
View File

@@ -203,7 +203,7 @@ func startComponents(manifestURL string) (apiServerURL string) {
nodeResources := &api.NodeResources{}
nodeController := nodeControllerPkg.NewNodeController(nil, "", machineList, nodeResources, cl, fakeKubeletClient{})
nodeController.Run(5*time.Second, 10)
nodeController.Run(5*time.Second, 10, true)
// Kubelet (localhost)
testRootDir := makeTempDirOrDie("kubelet_integ_1.")

2
cmd/kubernetes/kubernetes.go
View File

@@ -124,7 +124,7 @@ func runControllerManager(machineList []string, cl *client.Client, nodeMilliCPU,
}
kubeClient := &client.HTTPKubeletClient{Client: http.DefaultClient, Port: ports.KubeletPort}
nodeController := nodeControllerPkg.NewNodeController(nil, "", machineList, nodeResources, cl, kubeClient)
nodeController.Run(10*time.Second, 10)
nodeController.Run(10*time.Second, 10, true)
endpoints := service.NewEndpointController(cl)
go util.Forever(func() { endpoints.SyncServiceEndpoints() }, time.Second*10)