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

Automatic merge from submit-queue Retry updating deployment only on update conflict error

Merge pull request #29188 from mfojtik/retry-on-update
d9fbb9f6 · k8s-merge-robot · GitHub · 44665313 · 30954373 · d9fbb9f6
Commit d9fbb9f6 authored Jul 19, 2016 by k8s-merge-robot Committed by GitHub Jul 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

stop.go pkg/kubectl/stop.go +5 -1

No files found.
--- a/pkg/kubectl/stop.go
+++ b/pkg/kubectl/stop.go
@@ -424,7 +424,11 @@ func (reaper *DeploymentReaper) updateDeploymentWithRetries(namespace, name stri
 		if deployment, err = deployments.Update(deployment); err == 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
 }