github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #29188 from mfojtik/retry-on-update

Browse Source 
Automatic merge from submit-queue

Retry updating deployment only on update conflict error
This commit is contained in:
k8s-merge-robot 2016-07-19 08:46:50 -07:00 committed by GitHub
commit d9fbb9f600
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubectl/stop.go
View File

@ -424,7 +424,11 @@ func (reaper *DeploymentReaper) updateDeploymentWithRetries(namespace, name stri
if deployment, err = deployments.Update(deployment); err == nil { if deployment, err = deployments.Update(deployment); err == nil {
return true, nil return true, nil
} }
return false, nil // Retry only on update conflict.
if errors.IsConflict(err) {
return false, nil
}
return false, err
}) })
return deployment, err return deployment, err
} }