Merge pull request #63597 from liggitt/e2e-metrics-discovery

Automatic merge from submit-queue (batch tested with PRs 63597, 63599). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. don't block e2e namespace cleanup checks on metrics.k8s.io API group e2e tests discovery persisted resource types and ensure they were cleaned up by namespace deletion the metrics.k8s.io API group doesn't have any persisted resources, so if there is a discovery error involving that group, we can ignore it for purposes of e2e cleanup checks ```release-note NONE ```

Merge pull request #63597 from liggitt/e2e-metrics-discovery
21fb09b0 · Kubernetes Submit Queue · GitHub · 234939dc · 1fc99a24 · 21fb09b0
Unverified Commit 21fb09b0 authored May 09, 2018 by Kubernetes Submit Queue Committed by GitHub May 09, 2018
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

util.go test/e2e/framework/util.go +2 -0

No files found.
--- a/test/e2e/framework/util.go
+++ b/test/e2e/framework/util.go
@@ -1221,6 +1221,8 @@ func isDynamicDiscoveryError(err error) bool {
 			// garbage_collector
 		case "wardle.k8s.io":
 			// aggregator
+		case "metrics.k8s.io":
+			// aggregated metrics server add-on, no persisted resources
 		default:
 			Logf("discovery error for unexpected group: %#v", gv)
 			return false