Merge pull request kubernetes#72376 from liggitt/filter-ns-debugging

k8s-ci-robot · web-flow · commit a6ba2ebf85d8 · 2018-12-27T22:38:56.000-08:00
Filter resources logged by e2e ns debugging
diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go
@@ -1325,6 +1325,7 @@ func hasRemainingContent(c clientset.Interface, dynamicClient dynamic.Interface,
 	if err != nil {
 		return false, err
 	}
+	resources = discovery.FilteredBy(discovery.SupportsAllVerbs{Verbs: []string{"list", "delete"}}, resources)
 	groupVersionResources, err := discovery.GroupVersionResources(resources)
 	if err != nil {
 		return false, err

Original file line number	Diff line number	Diff line change
`@@ -1325,6 +1325,7 @@ func hasRemainingContent(c clientset.Interface, dynamicClient dynamic.Interface,`
`1325`	`1325`	`if err != nil {`
`1326`	`1326`	`return false, err`
`1327`	`1327`	`}`
	`1328`	`+ resources = discovery.FilteredBy(discovery.SupportsAllVerbs{Verbs: []string{"list", "delete"}}, resources)`
`1328`	`1329`	`groupVersionResources, err := discovery.GroupVersionResources(resources)`
`1329`	`1330`	`if err != nil {`
`1330`	`1331`	`return false, err`