MessageExpression for ValidatingAdmissionPolicy #116397
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
do-not-merge/work-in-progress
k8s-ci-robot
added
kind/api-change
|
/triage accepted |
k8s-ci-robot
added
triage/accepted
jiahuif
force-pushed
the
feature/validating-admission-policy/message-expression
branch
from
19434f7
to
ff7f5c7
Compare
k8s-ci-robot
added
size/M
jiahuif
force-pushed
the
feature/validating-admission-policy/message-expression
branch
from
ff7f5c7
to
1cad54b
Compare
k8s-ci-robot
added
size/L
k8s-ci-robot
removed
the
lgtm
jiahuif
force-pushed
the
feature/validating-admission-policy/message-expression
branch
from
80a2288
to
2ac6120
Compare
liggitt
reviewed
Mar 13, 2023
jiahuif
force-pushed
the
feature/validating-admission-policy/message-expression
branch
from
2ac6120
to
46fcb76
Compare
k8s-ci-robot
added
the
approved
cici37
reviewed
Mar 13, 2023
| // runtimeCELCostBudget was added for testing purpose only. Callers should always use const RuntimeCELCostBudget from k8s.io/apiserver/pkg/apis/cel/config.go as input. | ||
| ForInput(ctx context.Context, versionedAttr *admission.VersionedAttributes, request *v1.AdmissionRequest, optionalVars OptionalVariableBindings, runtimeCELCostBudget int64) ([]EvaluationResult, error) | ||
| // If cost budget is calculated, the filter should return the remaining budget. | ||
| ForInput(ctx context.Context, versionedAttr *admission.VersionedAttributes, request *v1.AdmissionRequest, optionalVars OptionalVariableBindings, runtimeCELCostBudget int64) ([]EvaluationResult, int64, error) |
There was a problem hiding this comment.
Add test case for returned remaining budget?
jiahuif
force-pushed
the
feature/validating-admission-policy/message-expression
branch
5 times, most recently
from
159082b
to
51a9c91
Compare
cici37
reviewed
Mar 13, 2023
| @@ -43,11 +44,17 @@ type fakeCelFilter struct { | |||
| throwError bool | |||
| } | |||
|
|
|||
| func (f *fakeCelFilter) ForInput(context.Context, *admission.VersionedAttributes, *admissionv1.AdmissionRequest, cel.OptionalVariableBindings, int64) ([]cel.EvaluationResult, error) { | |||
| func (f *fakeCelFilter) ForInput(_ context.Context, _ *admission.VersionedAttributes, _ *admissionv1.AdmissionRequest, _ cel.OptionalVariableBindings, costBudget int64) ([]cel.EvaluationResult, int64, error) { | |||
| if costBudget <= 0 { | |||
There was a problem hiding this comment.
Not really. the expression itself costs one. Needs at least 1 to cover it.
cici37
reviewed
Mar 13, 2023
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/validator_test.go
Outdated
Show resolved
Hide resolved
jiahuif
force-pushed
the
feature/validating-admission-policy/message-expression
branch
2 times, most recently
from
7e6fb37
to
327a633
Compare
cici37
reviewed
Mar 13, 2023
| }, | ||
| }, | ||
| { | ||
| name: "messageExpression out of budget after successful eval of expression", |
There was a problem hiding this comment.
Great to see the test for budget shared between expression and messageExpression
jiahuif
force-pushed
the
feature/validating-admission-policy/message-expression
branch
2 times, most recently
from
074ac6d
to
e1678f2
Compare
|
/lgtm Thank you! |
k8s-ci-robot
added
the
lgtm
|
LGTM label has been added. Git tree hash: ddf4f31b9795dc949c3237c87f5daab21dba1a55
|
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cici37, jiahuif, liggitt The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
Thank you all for reviewing. |
jiahuif
deleted the
feature/validating-admission-policy/message-expression
branch
16 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
/kind feature
/kind api-change
What this PR does / why we need it:
This PR adds support for
messageExpressionto ValidatingAdmissionPolicy, to set a custom message when the policy rejects a request.Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
API REVIEW Please take a look at the first commit labeled
[API REVIEW]Please note that the API is mirrored from #115969, which already got API approved.
Does this PR introduce a user-facing change?
Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.: