mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-30 19:35:06 +00:00
Code Activity

refactor: move validation audit out of webhooks package (#4562)

Browse source 
Signed-off-by: Charles-Edouard Brétéché <charled.breteche@gmail.com>
This commit is contained in:
Charles-Edouard Brétéché 2022-09-09 11:27:07 +02:00 • committed by GitHub
parent ff7ed78b09
commit 3e5af370a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmd/kyverno/main.go
View file

@ -39,6 +39,7 @@ import (
"github.com/kyverno/kyverno/pkg/webhooks"
webhookspolicy "github.com/kyverno/kyverno/pkg/webhooks/policy"
webhooksresource "github.com/kyverno/kyverno/pkg/webhooks/resource"
"github.com/kyverno/kyverno/pkg/webhooks/resource/audit"
webhookgenerate "github.com/kyverno/kyverno/pkg/webhooks/updaterequest"
_ "go.uber.org/automaxprocs" // #nosec
kubeinformers "k8s.io/client-go/informers"
@ -361,7 +362,7 @@ func main() {
policyCache := policycache.NewCache()
policyCacheController := policycachecontroller.NewController(policyCache, kyvernoV1.ClusterPolicies(), kyvernoV1.Policies())
auditHandler := webhooksresource.NewValidateAuditHandler(
auditHandler := audit.NewValidateAuditHandler(
policyCache,
eventGenerator,
reportReqGen,

2
pkg/webhooks/resource/validate_audit.go → pkg/webhooks/resource/audit/validate_audit.go
View file

@ -1,4 +1,4 @@
package resource
package audit
import (
"strings"

3
pkg/webhooks/resource/fake.go
View file

@ -13,6 +13,7 @@ import (
"github.com/kyverno/kyverno/pkg/policycache"
"github.com/kyverno/kyverno/pkg/policyreport"
"github.com/kyverno/kyverno/pkg/webhooks"
"github.com/kyverno/kyverno/pkg/webhooks/resource/audit"
"github.com/kyverno/kyverno/pkg/webhooks/updaterequest"
webhookutils "github.com/kyverno/kyverno/pkg/webhooks/utils"
admissionv1 "k8s.io/api/admission/v1"
@ -56,7 +57,7 @@ func NewFakeHandlers(ctx context.Context, policyCache policycache.Cache) webhook
}
}
func newFakeAuditHandler() AuditHandler {
func newFakeAuditHandler() audit.AuditHandler {
return &fakeAuditHandler{}
}

5
pkg/webhooks/resource/handlers.go
View file

@ -27,6 +27,7 @@ import (
engineutils "github.com/kyverno/kyverno/pkg/utils/engine"
jsonutils "github.com/kyverno/kyverno/pkg/utils/json"
"github.com/kyverno/kyverno/pkg/webhooks"
"github.com/kyverno/kyverno/pkg/webhooks/resource/audit"
"github.com/kyverno/kyverno/pkg/webhooks/resource/validation"
webhookgenerate "github.com/kyverno/kyverno/pkg/webhooks/updaterequest"
webhookutils "github.com/kyverno/kyverno/pkg/webhooks/utils"
@ -59,7 +60,7 @@ type handlers struct {
prGenerator policyreport.GeneratorInterface
urGenerator webhookgenerate.Generator
eventGen event.Interface
auditHandler AuditHandler
auditHandler audit.AuditHandler
openAPIController openapi.ValidateInterface
pcBuilder webhookutils.PolicyContextBuilder
urUpdater webhookutils.UpdateRequestUpdater
@ -78,7 +79,7 @@ func NewHandlers(
prGenerator policyreport.GeneratorInterface,
urGenerator webhookgenerate.Generator,
eventGen event.Interface,
auditHandler AuditHandler,
auditHandler audit.AuditHandler,
openAPIController openapi.ValidateInterface,
) webhooks.Handlers {
return &handlers{