Skip to content

Commit

Permalink
fix: keep admission warnings (kyverno#5269)
Browse files Browse the repository at this point in the history
Signed-off-by: Charles-Edouard Brétéché <[email protected]>

Co-authored-by: Vyankatesh Kudtarkar <[email protected]>
  • Loading branch information
eddycharly and vyankyGH authored Nov 8, 2022
1 parent f5c7c68 commit 80c78a5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pkg/webhooks/policy/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func (h *handlers) Validate(logger logr.Logger, request *admissionv1.AdmissionRe
warnings, err := policyvalidate.Validate(policy, h.client, false, h.openApiManager)
if err != nil {
logger.Error(err, "policy validation errors")
return admissionutils.Response(err)
return admissionutils.Response(err, warnings...)
}
return admissionutils.Response(err, warnings...)
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/webhooks/resource/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,13 +134,13 @@ func (h *handlers) Validate(logger logr.Logger, request *admissionv1.AdmissionRe
ok, msg, warnings := vh.HandleValidation(h.metricsConfig, request, policies, policyContext, namespaceLabels, startTime)
if !ok {
logger.Info("admission request denied")
return admissionutils.Response(errors.New(msg))
return admissionutils.Response(errors.New(msg), warnings...)
}

defer h.handleDelete(logger, request)
go h.createUpdateRequests(logger, request, policyContext, generatePolicies, mutatePolicies, startTime)

return admissionutils.Response(nil, warnings...)
return admissionutils.ResponseSuccess(warnings...)
}

func (h *handlers) Mutate(logger logr.Logger, request *admissionv1.AdmissionRequest, failurePolicy string, startTime time.Time) *admissionv1.AdmissionResponse {
Expand Down

0 comments on commit 80c78a5

Please sign in to comment.