Merge pull request #65916 from xmudrii/release-1.10-ignored-res

Automatic merge from submit-queue. [1.10] gc: remove crd and apiservice from ignored resources Fixes #65818 This PR cherry-picks CRD and APIService removal from GC ignored resources, from #65856 and #65915. **Release note**: ```release-note The garbage collector now supports CustomResourceDefinitions and APIServices. ``` /cc @nikhita @liggitt /sig api-machinery /kind bug /priority important-soon

Merge pull request #65916 from xmudrii/release-1.10-ignored-res
f7ef7a26 · Kubernetes Submit Queue · GitHub · 68bea2f4 · 09f36f92 · f7ef7a26
Unverified Commit f7ef7a26 authored Jul 10, 2018 by Kubernetes Submit Queue Committed by GitHub Jul 10, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

options_test.go cmd/kube-controller-manager/app/options/options_test.go +0 -2

graph_builder.go pkg/controller/garbagecollector/graph_builder.go +0 -2

No files found.
--- a/cmd/kube-controller-manager/app/options/options_test.go
+++ b/cmd/kube-controller-manager/app/options/options_test.go
@@ -196,8 +196,6 @@ func TestAddFlags(t *testing.T) {
 					{Group: "authorization.k8s.io", Resource: "selfsubjectaccessreviews"},
 					{Group: "authorization.k8s.io", Resource: "localsubjectaccessreviews"},
 					{Group: "authorization.k8s.io", Resource: "selfsubjectrulesreviews"},
-					{Group: "apiregistration.k8s.io", Resource: "apiservices"},
-					{Group: "apiextensions.k8s.io", Resource: "customresourcedefinitions"},
 				},
 				NodeEvictionRate:                      0.2,
 				SecondaryNodeEvictionRate:             0.05,

--- a/pkg/controller/garbagecollector/graph_builder.go
+++ b/pkg/controller/garbagecollector/graph_builder.go
@@ -361,8 +361,6 @@ var ignoredResources = map[schema.GroupResource]struct{}{
 	{Group: "authorization.k8s.io", Resource: "selfsubjectaccessreviews"}:  {},
 	{Group: "authorization.k8s.io", Resource: "localsubjectaccessreviews"}: {},
 	{Group: "authorization.k8s.io", Resource: "selfsubjectrulesreviews"}:   {},
-	{Group: "apiregistration.k8s.io", Resource: "apiservices"}:             {},
-	{Group: "apiextensions.k8s.io", Resource: "customresourcedefinitions"}: {},
 }

 // DefaultIgnoredResources returns the default set of resources that the garbage collector controller