Merge pull request #38701 from gmarek/routecontroller

Automatic merge from submit-queue (batch tested with PRs 38736, 38701) Don't retry creating route if it already exists Ref. #38618

Merge pull request #38701 from gmarek/routecontroller
3479522d · Kubernetes Submit Queue · GitHub · 23cd9d7b · 98fdcf15 · 3479522d
Commit 3479522d authored Dec 14, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 14, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

gce.go pkg/cloudprovider/providers/gce/gce.go +6 -1

No files found.
--- a/pkg/cloudprovider/providers/gce/gce.go
+++ b/pkg/cloudprovider/providers/gce/gce.go
@@ -2400,7 +2400,12 @@ func (gce *GCECloud) CreateRoute(clusterName string, nameHint string, route *clo
 		Description:     k8sNodeRouteTag,
 	}).Do()
 	if err != nil {
-		return err
+		if isHTTPErrorCode(err, http.StatusConflict) {
+			glog.Info("Route %v already exists.")
+			return nil
+		} else {
+			return err
+		}
 	}
 	return gce.waitForGlobalOp(insertOp)
 }