From f3d9ad678a2f417ef5b0783a9cb5049be3b43a0b Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Thu, 2 Mar 2017 18:00:14 -0500
Subject: [PATCH] Handle potential conflicts on service endpoint test deletion

Cleanup should ignore conflicts and notfound errors
---
 test/e2e/framework/BUILD           |  1 +
 test/e2e/framework/service_util.go | 31 +++++++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/test/e2e/framework/BUILD b/test/e2e/framework/BUILD
index 20c926cf21..a3fa78a6ad 100644
--- a/test/e2e/framework/BUILD
+++ b/test/e2e/framework/BUILD
@@ -54,6 +54,7 @@ go_library(
         "//pkg/client/clientset_generated/clientset/typed/rbac/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
         "//pkg/client/conditions:go_default_library",
+        "//pkg/client/retry:go_default_library",
         "//pkg/client/unversioned/remotecommand:go_default_library",
         "//pkg/cloudprovider:go_default_library",
         "//pkg/cloudprovider/providers/aws:go_default_library",
diff --git a/test/e2e/framework/service_util.go b/test/e2e/framework/service_util.go
index b9d5f8339d..395b4dccbf 100644
--- a/test/e2e/framework/service_util.go
+++ b/test/e2e/framework/service_util.go
@@ -37,6 +37,7 @@ import (
 	"k8s.io/kubernetes/pkg/api/v1/service"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
+	"k8s.io/kubernetes/pkg/client/retry"
 	testutils "k8s.io/kubernetes/test/utils"
 
 	. "github.com/onsi/ginkgo"
@@ -843,16 +844,34 @@ func (t *ServiceTestFixture) Cleanup() []error {
 	var errs []error
 	for rcName := range t.rcs {
 		By("stopping RC " + rcName + " in namespace " + t.Namespace)
-		// First, resize the RC to 0.
-		patch := `{"spec":{"replicas":0}}`
-		_, err := t.Client.Core().ReplicationControllers(t.Namespace).Patch(rcName, types.StrategicMergePatchType, []byte(patch))
+		err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
+			// First, resize the RC to 0.
+			old, err := t.Client.Core().ReplicationControllers(t.Namespace).Get(rcName, metav1.GetOptions{})
+			if err != nil {
+				if errors.IsNotFound(err) {
+					return nil
+				}
+				return err
+			}
+			x := int32(0)
+			old.Spec.Replicas = &x
+			if _, err := t.Client.Core().ReplicationControllers(t.Namespace).Update(old); err != nil {
+				if errors.IsNotFound(err) {
+					return nil
+				}
+				return err
+			}
+			return nil
+		})
 		if err != nil {
 			errs = append(errs, err)
 		}
 		// TODO(mikedanese): Wait.
 		// Then, delete the RC altogether.
 		if err := t.Client.Core().ReplicationControllers(t.Namespace).Delete(rcName, nil); err != nil {
-			errs = append(errs, err)
+			if !errors.IsNotFound(err) {
+				errs = append(errs, err)
+			}
 		}
 	}
 
@@ -860,7 +879,9 @@ func (t *ServiceTestFixture) Cleanup() []error {
 		By("deleting service " + serviceName + " in namespace " + t.Namespace)
 		err := t.Client.Core().Services(t.Namespace).Delete(serviceName, nil)
 		if err != nil {
-			errs = append(errs, err)
+			if !errors.IsNotFound(err) {
+				errs = append(errs, err)
+			}
 		}
 	}