From bda81f0b93696a39b6405649b9a7c70b2e93f815 Mon Sep 17 00:00:00 2001 From: Shuting Zhao Date: Wed, 20 May 2020 13:43:12 -0700 Subject: [PATCH] - fix variable scope - debug log --- pkg/engine/validation.go | 2 +- pkg/webhooks/server.go | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/engine/validation.go b/pkg/engine/validation.go index 94f18a346b..152774c04c 100644 --- a/pkg/engine/validation.go +++ b/pkg/engine/validation.go @@ -242,7 +242,7 @@ func validatePatterns(log logr.Logger, ctx context.EvalInterface, resource unstr if path, err := validate.ValidateResourceWithPattern(logger, resource.Object, pattern); err != nil { // validation failed resp.Success = false - resp.Message = fmt.Sprintf("Validation error: %s; Validation rule '%s' failed at path '%s'", + resp.Message = fmt.Sprintf("Validation error: %s; Validation rule %s failed at path %s", rule.Validation.Message, rule.Name, path) return resp } diff --git a/pkg/webhooks/server.go b/pkg/webhooks/server.go index 4607639557..3a6cd733b4 100644 --- a/pkg/webhooks/server.go +++ b/pkg/webhooks/server.go @@ -277,10 +277,12 @@ func (ws *WebhookServer) resourceMutation(request *v1beta1.AdmissionRequest) *v1 // MUTATION // mutation failure should not block the resource creation // any mutation failure is reported as the violation - patches := ws.HandleMutation(request, resource, policies, ctx, userRequestInfo) + patches = ws.HandleMutation(request, resource, policies, ctx, userRequestInfo) + logger.V(7).Info("", "generated patches", string(patches)) // patch the resource with patches before handling validation rules patchedResource = processResourceWithPatches(patches, request.Object.Raw, logger) + logger.V(7).Info("", "patchedResource", string(patchedResource)) if ws.resourceWebhookWatcher != nil && ws.resourceWebhookWatcher.RunValidationInMutatingWebhook == "true" { // VALIDATION