From 24f67fd84569c0751414218cca184599c34f8a50 Mon Sep 17 00:00:00 2001 From: David Zhu Date: Mon, 10 Sep 2018 11:01:26 -0700 Subject: [PATCH] Ignore not found endpoint on deletion --- test/e2e/storage/drivers/BUILD | 1 + test/e2e/storage/drivers/in_tree.go | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/test/e2e/storage/drivers/BUILD b/test/e2e/storage/drivers/BUILD index fecee3c2e91..72beb967aae 100644 --- a/test/e2e/storage/drivers/BUILD +++ b/test/e2e/storage/drivers/BUILD @@ -13,6 +13,7 @@ go_library( "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/rbac/v1beta1:go_default_library", "//staging/src/k8s.io/api/storage/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", diff --git a/test/e2e/storage/drivers/in_tree.go b/test/e2e/storage/drivers/in_tree.go index 5b5a9de2df4..05b76e7eafb 100644 --- a/test/e2e/storage/drivers/in_tree.go +++ b/test/e2e/storage/drivers/in_tree.go @@ -47,6 +47,7 @@ import ( "k8s.io/api/core/v1" rbacv1beta1 "k8s.io/api/rbac/v1beta1" storagev1 "k8s.io/api/storage/v1" + "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/sets" @@ -280,7 +281,10 @@ func (g *glusterFSDriver) DeleteVolume(volType testpatterns.TestVolType) { framework.Logf("Deleting Gluster endpoints %q...", name) err := cs.CoreV1().Endpoints(ns.Name).Delete(name, nil) if err != nil { - framework.Failf("Gluster delete endpoints failed: %v", err) + if !errors.IsNotFound(err) { + framework.Failf("Gluster delete endpoints failed: %v", err) + } + framework.Logf("Gluster endpoints %q not found, assuming deleted", name) } framework.Logf("Deleting Gluster server pod %q...", g.serverPod.Name) err = framework.DeletePodWithWait(f, cs, g.serverPod)