From 367cc42541e0045055e893dc45f798b9f0bb8803 Mon Sep 17 00:00:00 2001 From: derekwaynecarr Date: Wed, 31 Aug 2016 13:41:14 -0400 Subject: [PATCH] E2E framework ignores whitelisted resources when verifying namespace deletion --- test/e2e/framework/util.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index 9d80701e350..c3244219565 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -1168,6 +1168,9 @@ func hasRemainingContent(c *client.Client, clientPool dynamic.ClientPool, namesp return false, err } + // TODO: temporary hack for https://github.com/kubernetes/kubernetes/issues/31798 + ignoredResources := sets.NewString("bindings") + contentRemaining := false // 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 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{}) if err != nil { // not all resources support list, so we ignore those