diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/options/options_test.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/options/options_test.go index 2fadaea9c986..18ec466bb35e 100644 --- a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/options/options_test.go +++ b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/options/options_test.go @@ -176,17 +176,7 @@ func TestAddFlags(t *testing.T) { GarbageCollectorController: &cmoptions.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/vendor/k8s.io/kubernetes/pkg/controller/garbagecollector/graph_builder.go b/vendor/k8s.io/kubernetes/pkg/controller/garbagecollector/graph_builder.go index dd4193a05226..39796ae55457 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/garbagecollector/graph_builder.go +++ b/vendor/k8s.io/kubernetes/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/vendor/k8s.io/kubernetes/pkg/quota/install/registry.go b/vendor/k8s.io/kubernetes/pkg/quota/install/registry.go index 79f0cdb6f1a4..dd4596d310a6 100644 --- a/vendor/k8s.io/kubernetes/pkg/quota/install/registry.go +++ b/vendor/k8s.io/kubernetes/pkg/quota/install/registry.go @@ -37,29 +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: "authorization.openshift.io", Resource: "selfsubjectaccessreviews"}: {}, - {Group: "authorization.openshift.io", Resource: "subjectaccessreviews"}: {}, - {Group: "authorization.openshift.io", Resource: "localsubjectaccessreviews"}: {}, - {Group: "authorization.openshift.io", Resource: "resourceaccessreviews"}: {}, - {Group: "authorization.openshift.io", Resource: "localresourceaccessreviews"}: {}, - {Group: "authorization.openshift.io", Resource: "selfsubjectrulesreviews"}: {}, - {Group: "authorization.openshift.io", Resource: "subjectrulesreviews"}: {}, - {Group: "authorization.openshift.io", Resource: "roles"}: {}, - {Group: "authorization.openshift.io", Resource: "rolebindings"}: {}, - {Group: "authorization.openshift.io", Resource: "clusterroles"}: {}, - {Group: "authorization.openshift.io", Resource: "clusterrolebindings"}: {}, - {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