Reduce RCR throttling requests (kyverno#1376)

* reduce RCR throtlling requests * update logger in init container
realshuting · Dec 9, 2020 · 39421ca · 39421ca
1 parent b7cecd0
commit 39421ca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/cmd/initContainer/main.go b/cmd/initContainer/main.go
@@ -10,7 +10,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/gardener/controller-manager-library/pkg/logger"
 	"github.com/kyverno/kyverno/pkg/config"
 	client "github.com/kyverno/kyverno/pkg/dclient"
 	"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 {
 	crcrList, err := client.ListResource("", kind, "", nil)
 	if err != nil && !errors.IsNotFound(err) {
-		logger.Error(err, "failed to list clusterReportChangeRequest")
+		log.Log.Error(err, "failed to list clusterReportChangeRequest")
 		return nil
 	}
 
@@ -334,13 +333,13 @@ func removeClusterReportChangeRequest(client *client.Client, kind string) error
 func removeViolationCRD(client *client.Client) error {
 	if err := client.DeleteResource("", "CustomResourceDefinition", "", "policyviolations.kyverno.io", false); err != nil {
 		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 !errors.IsNotFound(err) {
-			logger.Error(err, "failed to delete CRD clusterPolicyViolation")
+			log.Log.Error(err, "failed to delete CRD clusterPolicyViolation")
 		}
 	}
 	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)
 	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
 	}
 
-	logger.Info("successfully cleaned up resource", "kind", kind, "name", name)
+	log.Log.Info("successfully cleaned up resource", "kind", kind, "name", name)
 }
diff --git a/pkg/policyreport/reportcontroller.go b/pkg/policyreport/reportcontroller.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"reflect"
 	"strings"
-	"sync"
 
 	"github.com/go-logr/logr"
 	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{}) {
 	defer g.log.V(5).Info("successfully cleaned up report requests")
 	if requests, ok := requestsGeneral.([]*changerequest.ReportChangeRequest); ok {
-		var wg sync.WaitGroup
-		wg.Add(len(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 !apierrors.IsNotFound(err) {
-						g.log.Error(err, "failed to delete report request")
-					}
+			if err := g.dclient.DeleteResource(request.APIVersion, "ReportChangeRequest", config.KyvernoNamespace, request.Name, false); err != nil {
+				if !apierrors.IsNotFound(err) {
+					g.log.Error(err, "failed to delete report request")
 				}
-				wg.Done()
-			}(request)
+			}
 		}
-		wg.Wait()
 	}
 
 	if requests, ok := requestsGeneral.([]*changerequest.ClusterReportChangeRequest); ok {