Merge pull request #68480 from davidz627/fix/glusterSubpathTest

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",

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)