Merge pull request #65918 from nikhita/release-1.9-gc-ignored-resources

Automatic merge from submit-queue. [1.9] GC: remove CRD and APIService from ignored resources Fixes #65818 This cherry-picks the GC bits for CRD and APIService from #65856. See #65856 (comment) for more details. **Release note**: ```release-note The garbage collector now supports CustomResourceDefinitions and APIServices. ```
kubernetes · Jul 12, 2018 · 707acf5 · 707acf5
2 parents a78ade1 + 04f2d7f
commit 707acf5
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/cmd/kube-controller-manager/app/options/options_test.go b/cmd/kube-controller-manager/app/options/options_test.go
@@ -190,8 +190,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,

diff --git 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