github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #68480 from davidz627/fix/glusterSubpathTest

Browse Source 
Ignore "not found" endpoint on deletion for Gluster Storage Test
This commit is contained in:
k8s-ci-robot 2018-09-10 18:08:29 -07:00 committed by GitHub
commit 1ae00dbe04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/storage/drivers/BUILD
View File

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

6
test/e2e/storage/drivers/in_tree.go
View File

@ -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)