diff --git a/cmd/kyverno/main.go b/cmd/kyverno/main.go index 926e8911bc..72d52f7df4 100644 --- a/cmd/kyverno/main.go +++ b/cmd/kyverno/main.go @@ -13,6 +13,7 @@ import ( "github.com/go-logr/logr" "github.com/kyverno/kyverno/cmd/internal" "github.com/kyverno/kyverno/pkg/auth/checker" + "github.com/kyverno/kyverno/pkg/breaker" "github.com/kyverno/kyverno/pkg/client/clientset/versioned" kyvernoinformer "github.com/kyverno/kyverno/pkg/client/informers/externalversions" "github.com/kyverno/kyverno/pkg/clients/dclient" @@ -25,7 +26,6 @@ import ( policycachecontroller "github.com/kyverno/kyverno/pkg/controllers/policycache" vapcontroller "github.com/kyverno/kyverno/pkg/controllers/validatingadmissionpolicy-generate" webhookcontroller "github.com/kyverno/kyverno/pkg/controllers/webhook" - "github.com/kyverno/kyverno/pkg/d4f" "github.com/kyverno/kyverno/pkg/engine/apicall" "github.com/kyverno/kyverno/pkg/event" "github.com/kyverno/kyverno/pkg/globalcontext/store" @@ -522,7 +522,7 @@ func main() { setup.Logger.Error(errors.New("failed to start admission reports watcher"), "failed to start admission reports watcher") os.Exit(1) } - reportsBreaker := d4f.NewBreaker("admission reports", func(context.Context) bool { + reportsBreaker := breaker.NewBreaker("admission reports", func(context.Context) bool { count, isRunning := ephrs.Count() if !isRunning { return true diff --git a/pkg/d4f/breaker.go b/pkg/breaker/breaker.go similarity index 99% rename from pkg/d4f/breaker.go rename to pkg/breaker/breaker.go index 7866307d3f..580f8e0229 100644 --- a/pkg/d4f/breaker.go +++ b/pkg/breaker/breaker.go @@ -1,4 +1,4 @@ -package d4f +package breaker import ( "context" diff --git a/pkg/d4f/breaker_test.go b/pkg/breaker/breaker_test.go similarity index 98% rename from pkg/d4f/breaker_test.go rename to pkg/breaker/breaker_test.go index b1b626d6b0..649f2c4ce9 100644 --- a/pkg/d4f/breaker_test.go +++ b/pkg/breaker/breaker_test.go @@ -1,4 +1,4 @@ -package d4f +package breaker import ( "context" diff --git a/pkg/webhooks/resource/handlers.go b/pkg/webhooks/resource/handlers.go index 827be222fe..96deb10a86 100644 --- a/pkg/webhooks/resource/handlers.go +++ b/pkg/webhooks/resource/handlers.go @@ -11,13 +11,13 @@ import ( "github.com/alitto/pond" "github.com/go-logr/logr" kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1" + "github.com/kyverno/kyverno/pkg/breaker" "github.com/kyverno/kyverno/pkg/client/clientset/versioned" kyvernov1informers "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1" kyvernov1listers "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1" kyvernov2listers "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v2" "github.com/kyverno/kyverno/pkg/clients/dclient" "github.com/kyverno/kyverno/pkg/config" - "github.com/kyverno/kyverno/pkg/d4f" engineapi "github.com/kyverno/kyverno/pkg/engine/api" "github.com/kyverno/kyverno/pkg/engine/jmespath" "github.com/kyverno/kyverno/pkg/engine/policycontext" @@ -64,7 +64,7 @@ type resourceHandlers struct { admissionReports bool backgroundServiceAccountName string auditPool *pond.WorkerPool - reportsBreaker d4f.Breaker + reportsBreaker breaker.Breaker } func NewHandlers( @@ -85,7 +85,7 @@ func NewHandlers( jp jmespath.Interface, maxAuditWorkers int, maxAuditCapacity int, - reportsBreaker d4f.Breaker, + reportsBreaker breaker.Breaker, ) webhooks.ResourceHandlers { return &resourceHandlers{ engine: engine, diff --git a/pkg/webhooks/resource/imageverification/handler.go b/pkg/webhooks/resource/imageverification/handler.go index 1e726159a6..115800c7b7 100644 --- a/pkg/webhooks/resource/imageverification/handler.go +++ b/pkg/webhooks/resource/imageverification/handler.go @@ -7,9 +7,9 @@ import ( "github.com/go-logr/logr" kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1" + "github.com/kyverno/kyverno/pkg/breaker" "github.com/kyverno/kyverno/pkg/client/clientset/versioned" "github.com/kyverno/kyverno/pkg/config" - "github.com/kyverno/kyverno/pkg/d4f" "github.com/kyverno/kyverno/pkg/engine" engineapi "github.com/kyverno/kyverno/pkg/engine/api" "github.com/kyverno/kyverno/pkg/engine/mutate/patch" @@ -40,7 +40,7 @@ type imageVerificationHandler struct { admissionReports bool cfg config.Configuration nsLister corev1listers.NamespaceLister - reportsBreaker d4f.Breaker + reportsBreaker breaker.Breaker } func NewImageVerificationHandler( @@ -51,7 +51,7 @@ func NewImageVerificationHandler( admissionReports bool, cfg config.Configuration, nsLister corev1listers.NamespaceLister, - reportsBreaker d4f.Breaker, + reportsBreaker breaker.Breaker, ) ImageVerificationHandler { return &imageVerificationHandler{ kyvernoClient: kyvernoClient, diff --git a/pkg/webhooks/resource/validation/validation.go b/pkg/webhooks/resource/validation/validation.go index ffec49f538..d344df0297 100644 --- a/pkg/webhooks/resource/validation/validation.go +++ b/pkg/webhooks/resource/validation/validation.go @@ -7,9 +7,9 @@ import ( "github.com/go-logr/logr" kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1" + "github.com/kyverno/kyverno/pkg/breaker" "github.com/kyverno/kyverno/pkg/client/clientset/versioned" "github.com/kyverno/kyverno/pkg/config" - "github.com/kyverno/kyverno/pkg/d4f" engineapi "github.com/kyverno/kyverno/pkg/engine/api" "github.com/kyverno/kyverno/pkg/engine/policycontext" "github.com/kyverno/kyverno/pkg/event" @@ -46,7 +46,7 @@ func NewValidationHandler( metrics metrics.MetricsConfigManager, cfg config.Configuration, nsLister corev1listers.NamespaceLister, - reportsBreaker d4f.Breaker, + reportsBreaker breaker.Breaker, ) ValidationHandler { return &validationHandler{ log: log, @@ -74,7 +74,7 @@ type validationHandler struct { metrics metrics.MetricsConfigManager cfg config.Configuration nsLister corev1listers.NamespaceLister - reportsBreaker d4f.Breaker + reportsBreaker breaker.Breaker } func (v *validationHandler) HandleValidationEnforce(