From c81dd2aa4cf90fc6c4933e0888d066c091b207ba Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Thu, 5 Feb 2015 00:25:07 -0500
Subject: [PATCH] UPSTREAM: Register nodes that already exist statically

---
 .../kubernetes/pkg/cloudprovider/controller/nodecontroller.go  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/controller/nodecontroller.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/controller/nodecontroller.go
index acdf826c5dc3..df547bb84ab7 100644
--- a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/controller/nodecontroller.go
+++ b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/controller/nodecontroller.go
@@ -25,6 +25,7 @@ import (
 	"time"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	apierrors "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/probe"
@@ -120,7 +121,7 @@ func (s *NodeController) RegisterNodes(nodes *api.NodeList, retryCount int, retr
 				continue
 			}
 			_, err := s.kubeClient.Nodes().Create(&node)
-			if err == nil {
+			if err == nil || apierrors.IsAlreadyExists(err) {
 				registered.Insert(node.Name)
 				glog.Infof("Registered node in registry: %s", node.Name)
 			} else {