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
pull/6/head
Kubernetes Submit Queue 2016-12-14 16:10:57 -08:00 committed by GitHub
commit 3479522de5
1 changed files with 6 additions and 1 deletions

View File

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