github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 18:31:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #110888 from likakuli/feature_ignoreeventforgc

Browse Source 
feat: ignore all event resource for gc
This commit is contained in:
Kubernetes Prow Robot 2022-08-01 12:10:28 -07:00 committed by GitHub
commit 42b6b2887c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/kube-controller-manager/app/options/options_test.go
View File

@ -23,6 +23,7 @@ import (
"time" "time"
"github.com/spf13/pflag" "github.com/spf13/pflag"
eventv1 "k8s.io/api/events/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/diff"
apiserveroptions "k8s.io/apiserver/pkg/server/options" apiserveroptions "k8s.io/apiserver/pkg/server/options"
@ -35,6 +36,8 @@ import (
cmconfig "k8s.io/controller-manager/config" cmconfig "k8s.io/controller-manager/config"
cmoptions "k8s.io/controller-manager/options" cmoptions "k8s.io/controller-manager/options"
migration "k8s.io/controller-manager/pkg/leadermigration/options" migration "k8s.io/controller-manager/pkg/leadermigration/options"
netutils "k8s.io/utils/net"
kubecontrollerconfig "k8s.io/kubernetes/cmd/kube-controller-manager/app/config" kubecontrollerconfig "k8s.io/kubernetes/cmd/kube-controller-manager/app/config"
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config" kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
csrsigningconfig "k8s.io/kubernetes/pkg/controller/certificates/signer/config" csrsigningconfig "k8s.io/kubernetes/pkg/controller/certificates/signer/config"
@ -60,7 +63,6 @@ import (
attachdetachconfig "k8s.io/kubernetes/pkg/controller/volume/attachdetach/config" attachdetachconfig "k8s.io/kubernetes/pkg/controller/volume/attachdetach/config"
ephemeralvolumeconfig "k8s.io/kubernetes/pkg/controller/volume/ephemeral/config" ephemeralvolumeconfig "k8s.io/kubernetes/pkg/controller/volume/ephemeral/config"
persistentvolumeconfig "k8s.io/kubernetes/pkg/controller/volume/persistentvolume/config" persistentvolumeconfig "k8s.io/kubernetes/pkg/controller/volume/persistentvolume/config"
netutils "k8s.io/utils/net"
) )
var args = []string{ var args = []string{
@ -295,6 +297,7 @@ func TestAddFlags(t *testing.T) {
ConcurrentGCSyncs: 30, ConcurrentGCSyncs: 30,
GCIgnoredResources: []garbagecollectorconfig.GroupResource{ GCIgnoredResources: []garbagecollectorconfig.GroupResource{
{Group: "", Resource: "events"}, {Group: "", Resource: "events"},
{Group: eventv1.GroupName, Resource: "events"},
}, },
EnableGarbageCollector: false, EnableGarbageCollector: false,
}, },
@ -550,6 +553,7 @@ func TestApplyTo(t *testing.T) {
ConcurrentGCSyncs: 30, ConcurrentGCSyncs: 30,
GCIgnoredResources: []garbagecollectorconfig.GroupResource{ GCIgnoredResources: []garbagecollectorconfig.GroupResource{
{Group: "", Resource: "events"}, {Group: "", Resource: "events"},
{Group: eventv1.GroupName, Resource: "events"},
}, },
EnableGarbageCollector: false, EnableGarbageCollector: false,
}, },

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

@ -25,6 +25,7 @@ import (
"k8s.io/klog/v2" "k8s.io/klog/v2"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
eventv1 "k8s.io/api/events/v1"
"k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
@ -38,6 +39,7 @@ import (
"k8s.io/client-go/tools/record" "k8s.io/client-go/tools/record"
"k8s.io/client-go/util/workqueue" "k8s.io/client-go/util/workqueue"
"k8s.io/controller-manager/pkg/informerfactory" "k8s.io/controller-manager/pkg/informerfactory"
"k8s.io/kubernetes/pkg/controller/garbagecollector/metaonly" "k8s.io/kubernetes/pkg/controller/garbagecollector/metaonly"
) )
@ -318,7 +320,8 @@ func (gb *GraphBuilder) Run(stopCh <-chan struct{}) {
} }
var ignoredResources = map[schema.GroupResource]struct{}{ var ignoredResources = map[schema.GroupResource]struct{}{
{Group: "", Resource: "events"}: {}, {Group: "", Resource: "events"}: {},
{Group: eventv1.GroupName, Resource: "events"}: {},
} }
// DefaultIgnoredResources returns the default set of resources that the garbage collector controller // DefaultIgnoredResources returns the default set of resources that the garbage collector controller