From 30954373000cc9063724f4f8b57cf93e121deac1 Mon Sep 17 00:00:00 2001
From: Michal Fojtik <mfojtik@redhat.com>
Date: Tue, 19 Jul 2016 13:01:06 +0200
Subject: [PATCH] Retry updating deployment only on update conflict error

---
 pkg/kubectl/stop.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/kubectl/stop.go b/pkg/kubectl/stop.go
index 1d3a891bb7d..782d66bb04c 100644
--- 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
 }