From eacbd6292538fd85e53850ce096c4b9249084219 Mon Sep 17 00:00:00 2001 From: David Eads Date: Thu, 5 Jul 2018 08:15:16 -0400 Subject: [PATCH] only need to ignore resources that match discovery conditions --- .../app/options/options_test.go | 10 ---------- pkg/controller/garbagecollector/graph_builder.go | 12 +----------- pkg/quota/install/registry.go | 13 +------------ 3 files changed, 2 insertions(+), 33 deletions(-) diff --git a/cmd/kube-controller-manager/app/options/options_test.go b/cmd/kube-controller-manager/app/options/options_test.go index d684fa7bad..75a5fe891a 100644 --- a/cmd/kube-controller-manager/app/options/options_test.go +++ b/cmd/kube-controller-manager/app/options/options_test.go @@ -176,17 +176,7 @@ func TestAddFlags(t *testing.T) { GarbageCollectorController: &GarbageCollectorControllerOptions{ ConcurrentGCSyncs: 30, GCIgnoredResources: []componentconfig.GroupResource{ - {Group: "extensions", Resource: "replicationcontrollers"}, - {Group: "", Resource: "bindings"}, - {Group: "", Resource: "componentstatuses"}, {Group: "", Resource: "events"}, - {Group: "authentication.k8s.io", Resource: "tokenreviews"}, - {Group: "authorization.k8s.io", Resource: "subjectaccessreviews"}, - {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"}, }, EnableGarbageCollector: false, }, diff --git a/pkg/controller/garbagecollector/graph_builder.go b/pkg/controller/garbagecollector/graph_builder.go index dd4193a052..39796ae554 100644 --- a/pkg/controller/garbagecollector/graph_builder.go +++ b/pkg/controller/garbagecollector/graph_builder.go @@ -337,17 +337,7 @@ func (gb *GraphBuilder) Run(stopCh <-chan struct{}) { } var ignoredResources = map[schema.GroupResource]struct{}{ - {Group: "extensions", Resource: "replicationcontrollers"}: {}, - {Group: "", Resource: "bindings"}: {}, - {Group: "", Resource: "componentstatuses"}: {}, - {Group: "", Resource: "events"}: {}, - {Group: "authentication.k8s.io", Resource: "tokenreviews"}: {}, - {Group: "authorization.k8s.io", Resource: "subjectaccessreviews"}: {}, - {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"}: {}, + {Group: "", Resource: "events"}: {}, } // DefaultIgnoredResources returns the default set of resources that the garbage collector controller diff --git a/pkg/quota/install/registry.go b/pkg/quota/install/registry.go index 367a6a4016..dd4596d310 100644 --- a/pkg/quota/install/registry.go +++ b/pkg/quota/install/registry.go @@ -37,18 +37,7 @@ func NewQuotaConfigurationForControllers(f quota.ListerForResourceFunc) quota.Co // ignoredResources are ignored by quota by default var ignoredResources = map[schema.GroupResource]struct{}{ - {Group: "extensions", Resource: "replicationcontrollers"}: {}, - {Group: "extensions", Resource: "networkpolicies"}: {}, - {Group: "", Resource: "bindings"}: {}, - {Group: "", Resource: "componentstatuses"}: {}, - {Group: "", Resource: "events"}: {}, - {Group: "authentication.k8s.io", Resource: "tokenreviews"}: {}, - {Group: "authorization.k8s.io", Resource: "subjectaccessreviews"}: {}, - {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"}: {}, + {Group: "", Resource: "events"}: {}, } // DefaultIgnoredResources returns the default set of resources that quota system