Merge pull request kubernetes#5257 from deads2k/deads-eliminate-wait-…

…for-no-nodes eliminate wait with no nodes
duda · Mar 13, 2015 · 97e1295 · 97e1295
2 parents 505dbc5 + 91b92eb
commit 97e1295
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pkg/cloudprovider/controller/nodecontroller.go b/pkg/cloudprovider/controller/nodecontroller.go
@@ -141,6 +141,10 @@ func (s *NodeController) Run(period time.Duration, syncNodeList, syncNodeStatus
 
 // RegisterNodes registers the given list of nodes, it keeps retrying for `retryCount` times.
 func (s *NodeController) RegisterNodes(nodes *api.NodeList, retryCount int, retryInterval time.Duration) error {
+	if len(nodes.Items) == 0 {
+		return nil
+	}
+
 	registered := util.NewStringSet()
 	nodes = s.canonicalizeName(nodes)
 	for i := 0; i < retryCount; i++ {