github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

E2E framework ignores whitelisted resources when verifying namespace deletion

Browse Source
This commit is contained in:
derekwaynecarr
2016-08-31 13:41:14 -04:00
parent 83cc808ffb
commit 367cc42541
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/framework/util.go
View File

@@ -1168,6 +1168,9 @@ func hasRemainingContent(c *client.Client, clientPool dynamic.ClientPool, namesp
return false, err return false, err
} }
// TODO: temporary hack for https://github.com/kubernetes/kubernetes/issues/31798
ignoredResources := sets.NewString("bindings")
contentRemaining := false contentRemaining := false
// dump how many of resource type is on the server in a log. // dump how many of resource type is on the server in a log.
@@ -1181,6 +1184,11 @@ func hasRemainingContent(c *client.Client, clientPool dynamic.ClientPool, namesp
} }
// get the api resource // get the api resource
apiResource := unversioned.APIResource{Name: gvr.Resource, Namespaced: true} apiResource := unversioned.APIResource{Name: gvr.Resource, Namespaced: true}
// TODO: temporary hack for https://github.com/kubernetes/kubernetes/issues/31798
if ignoredResources.Has(apiResource.Name) {
Logf("namespace: %s, resource: %s, ignored listing per whitelist", namespace, apiResource.Name)
continue
}
obj, err := dynamicClient.Resource(&apiResource, namespace).List(&v1.ListOptions{}) obj, err := dynamicClient.Resource(&apiResource, namespace).List(&v1.ListOptions{})
if err != nil { if err != nil {
// not all resources support list, so we ignore those // not all resources support list, so we ignore those