github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #55772 from liggitt/gc-ignored-resources

Browse Source 
Automatic merge from submit-queue. 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>.

Only attempt to construct GC informers for watchable resources

A resource must support list/watch in addition to delete for an informer to be functional

Exclude resources that are not watchable from informer construction

Also fixes a bug with the graph builder not using the instance-configured list of ignored resources

/assign @ironcladlou

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-11-16 15:16:16 -08:00 committed by GitHub
commit b79e3d14d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/garbagecollector/garbagecollector.go
View File

@ -587,7 +587,7 @@ func (gc *GarbageCollector) GraphHasUID(UIDs []types.UID) bool {
// GetDeletableResources returns all resources from discoveryClient that the // GetDeletableResources returns all resources from discoveryClient that the
// garbage collector should recognize and work with. More specifically, all // garbage collector should recognize and work with. More specifically, all
// preferred resources which support the 'delete' verb. // preferred resources which support the 'delete', 'list', and 'watch' verbs.
// //
// All discovery errors are considered temporary. Upon encountering any error, // All discovery errors are considered temporary. Upon encountering any error,
// GetDeletableResources will log and return any discovered resources it was // GetDeletableResources will log and return any discovered resources it was
@ -607,7 +607,7 @@ func GetDeletableResources(discoveryClient discovery.ServerResourcesInterface) m
// This is extracted from discovery.GroupVersionResources to allow tolerating // This is extracted from discovery.GroupVersionResources to allow tolerating
// failures on a per-resource basis. // failures on a per-resource basis.
deletableResources := discovery.FilteredBy(discovery.SupportsAllVerbs{Verbs: []string{"delete"}}, preferredResources) deletableResources := discovery.FilteredBy(discovery.SupportsAllVerbs{Verbs: []string{"delete", "list", "watch"}}, preferredResources)
deletableGroupVersionResources := map[schema.GroupVersionResource]struct{}{} deletableGroupVersionResources := map[schema.GroupVersionResource]struct{}{}
for _, rl := range deletableResources { for _, rl := range deletableResources {
gv, err := schema.ParseGroupVersion(rl.GroupVersion) gv, err := schema.ParseGroupVersion(rl.GroupVersion)

15
pkg/controller/garbagecollector/garbagecollector_test.go
View File

@ -688,7 +688,7 @@ func TestGetDeletableResources(t *testing.T) {
// Valid GroupVersion // Valid GroupVersion
GroupVersion: "apps/v1", GroupVersion: "apps/v1",
APIResources: []metav1.APIResource{ APIResources: []metav1.APIResource{
{Name: "pods", Namespaced: true, Kind: "Pod", Verbs: metav1.Verbs{"delete"}}, {Name: "pods", Namespaced: true, Kind: "Pod", Verbs: metav1.Verbs{"delete", "list", "watch"}},
{Name: "services", Namespaced: true, Kind: "Service"}, {Name: "services", Namespaced: true, Kind: "Service"},
}, },
}, },
@ -696,7 +696,14 @@ func TestGetDeletableResources(t *testing.T) {
// Invalid GroupVersion, should be ignored // Invalid GroupVersion, should be ignored
GroupVersion: "foo//whatever", GroupVersion: "foo//whatever",
APIResources: []metav1.APIResource{ APIResources: []metav1.APIResource{
{Name: "bars", Namespaced: true, Kind: "Bar", Verbs: metav1.Verbs{"delete"}}, {Name: "bars", Namespaced: true, Kind: "Bar", Verbs: metav1.Verbs{"delete", "list", "watch"}},
},
},
{
// Valid GroupVersion, missing required verbs, should be ignored
GroupVersion: "acme/v1",
APIResources: []metav1.APIResource{
{Name: "widgets", Namespaced: true, Kind: "Widget", Verbs: metav1.Verbs{"delete"}},
}, },
}, },
}, },
@ -710,7 +717,7 @@ func TestGetDeletableResources(t *testing.T) {
{ {
GroupVersion: "apps/v1", GroupVersion: "apps/v1",
APIResources: []metav1.APIResource{ APIResources: []metav1.APIResource{
{Name: "pods", Namespaced: true, Kind: "Pod", Verbs: metav1.Verbs{"delete"}}, {Name: "pods", Namespaced: true, Kind: "Pod", Verbs: metav1.Verbs{"delete", "list", "watch"}},
{Name: "services", Namespaced: true, Kind: "Service"}, {Name: "services", Namespaced: true, Kind: "Service"},
}, },
}, },
@ -725,7 +732,7 @@ func TestGetDeletableResources(t *testing.T) {
{ {
GroupVersion: "apps/v1", GroupVersion: "apps/v1",
APIResources: []metav1.APIResource{ APIResources: []metav1.APIResource{
{Name: "pods", Namespaced: true, Kind: "Pod", Verbs: metav1.Verbs{"delete"}}, {Name: "pods", Namespaced: true, Kind: "Pod", Verbs: metav1.Verbs{"delete", "list", "watch"}},
{Name: "services", Namespaced: true, Kind: "Service"}, {Name: "services", Namespaced: true, Kind: "Service"},
}, },
}, },

2
pkg/controller/garbagecollector/graph_builder.go
View File

@ -230,7 +230,7 @@ func (gb *GraphBuilder) syncMonitors(resources map[schema.GroupVersionResource]s
kept := 0 kept := 0
added := 0 added := 0
for resource := range resources { for resource := range resources {
if _, ok := ignoredResources[resource.GroupResource()]; ok { if _, ok := gb.ignoredResources[resource.GroupResource()]; ok {
continue continue
} }
if m, ok := toRemove[resource]; ok { if m, ok := toRemove[resource]; ok {