mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-31 03:45:17 +00:00
Code Activity

Reduce RCR throttling requests (#1376)

Browse source 
* reduce RCR throtlling requests

* update logger in init container
This commit is contained in:
shuting 2020-12-09 09:29:52 -08:00 • committed by GitHub
parent b7cecd04ed
commit 39421ca6e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cmd/initContainer/main.go
View file

@ -10,7 +10,6 @@ import (
"sync" "sync"
"time" "time"
"github.com/gardener/controller-manager-library/pkg/logger"
"github.com/kyverno/kyverno/pkg/config" "github.com/kyverno/kyverno/pkg/config"
client "github.com/kyverno/kyverno/pkg/dclient" client "github.com/kyverno/kyverno/pkg/dclient"
"github.com/kyverno/kyverno/pkg/signal" "github.com/kyverno/kyverno/pkg/signal"
@ -321,7 +320,7 @@ func removeReportChangeRequest(client *client.Client, kind string) error {
func removeClusterReportChangeRequest(client *client.Client, kind string) error { func removeClusterReportChangeRequest(client *client.Client, kind string) error {
crcrList, err := client.ListResource("", kind, "", nil) crcrList, err := client.ListResource("", kind, "", nil)
if err != nil && !errors.IsNotFound(err) { if err != nil && !errors.IsNotFound(err) {
logger.Error(err, "failed to list clusterReportChangeRequest") log.Log.Error(err, "failed to list clusterReportChangeRequest")
return nil return nil
} }
@ -334,13 +333,13 @@ func removeClusterReportChangeRequest(client *client.Client, kind string) error
func removeViolationCRD(client *client.Client) error { func removeViolationCRD(client *client.Client) error {
if err := client.DeleteResource("", "CustomResourceDefinition", "", "policyviolations.kyverno.io", false); err != nil { if err := client.DeleteResource("", "CustomResourceDefinition", "", "policyviolations.kyverno.io", false); err != nil {
if !errors.IsNotFound(err) { if !errors.IsNotFound(err) {
logger.Error(err, "failed to delete CRD policyViolation") log.Log.Error(err, "failed to delete CRD policyViolation")
} }
} }
if err := client.DeleteResource("", "CustomResourceDefinition", "", "clusterpolicyviolations.kyverno.io", false); err != nil { if err := client.DeleteResource("", "CustomResourceDefinition", "", "clusterpolicyviolations.kyverno.io", false); err != nil {
if !errors.IsNotFound(err) { if !errors.IsNotFound(err) {
logger.Error(err, "failed to delete CRD clusterPolicyViolation") log.Log.Error(err, "failed to delete CRD clusterPolicyViolation")
} }
} }
return nil return nil
@ -362,9 +361,9 @@ func deleteResource(client *client.Client, apiversion, kind, ns, name string, wg
err := client.DeleteResource(apiversion, kind, ns, name, false) err := client.DeleteResource(apiversion, kind, ns, name, false)
if err != nil && !errors.IsNotFound(err) { if err != nil && !errors.IsNotFound(err) {
logger.Error(err, "failed to delete resource", "kind", kind, "name", name) log.Log.Error(err, "failed to delete resource", "kind", kind, "name", name)
return return
} }
logger.Info("successfully cleaned up resource", "kind", kind, "name", name) log.Log.Info("successfully cleaned up resource", "kind", kind, "name", name)
} }

15
pkg/policyreport/reportcontroller.go
View file

@ -4,7 +4,6 @@ import (
"fmt" "fmt"
"reflect" "reflect"
"strings" "strings"
"sync"
"github.com/go-logr/logr" "github.com/go-logr/logr"
changerequest "github.com/kyverno/kyverno/pkg/api/kyverno/v1alpha1" changerequest "github.com/kyverno/kyverno/pkg/api/kyverno/v1alpha1"
@ -569,19 +568,13 @@ func (g *ReportGenerator) updateReport(old interface{}, new *unstructured.Unstru
func (g *ReportGenerator) cleanupReportRequests(requestsGeneral interface{}) { func (g *ReportGenerator) cleanupReportRequests(requestsGeneral interface{}) {
defer g.log.V(5).Info("successfully cleaned up report requests") defer g.log.V(5).Info("successfully cleaned up report requests")
if requests, ok := requestsGeneral.([]*changerequest.ReportChangeRequest); ok { if requests, ok := requestsGeneral.([]*changerequest.ReportChangeRequest); ok {
var wg sync.WaitGroup
wg.Add(len(requests))
for _, request := range requests { for _, request := range requests {
go func(request *changerequest.ReportChangeRequest) { if err := g.dclient.DeleteResource(request.APIVersion, "ReportChangeRequest", config.KyvernoNamespace, request.Name, false); err != nil {
if err := g.dclient.DeleteResource(request.APIVersion, "ReportChangeRequest", config.KyvernoNamespace, request.Name, false); err != nil { if !apierrors.IsNotFound(err) {
if !apierrors.IsNotFound(err) { g.log.Error(err, "failed to delete report request")
g.log.Error(err, "failed to delete report request")
}
} }
wg.Done() }
}(request)
} }
wg.Wait()
} }
if requests, ok := requestsGeneral.([]*changerequest.ClusterReportChangeRequest); ok { if requests, ok := requestsGeneral.([]*changerequest.ClusterReportChangeRequest); ok {