github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Require match condition version only if matchConditions are specified

Browse Source
This commit is contained in:
Jordan Liggitt 2023-11-02 13:54:39 -04:00
parent 3240e2b28e
commit a000af25ff
No known key found for this signature in database
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/apiserver/pkg/apis/apiserver/validation/validation.go
View File

@ -512,7 +512,9 @@ func ValidateWebhookConfiguration(fldPath *field.Path, c *api.WebhookConfigurati
switch c.MatchConditionSubjectAccessReviewVersion { switch c.MatchConditionSubjectAccessReviewVersion {
case "": case "":
allErrs = append(allErrs, field.Required(fldPath.Child("matchConditionSubjectAccessReviewVersion"), "")) if len(c.MatchConditions) > 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("matchConditionSubjectAccessReviewVersion"), "required if match conditions are specified"))
}
case "v1": case "v1":
_ = &v1.SubjectAccessReview{} _ = &v1.SubjectAccessReview{}
default: default:

1
staging/src/k8s.io/apiserver/pkg/apis/apiserver/validation/validation_test.go
View File

@ -1438,6 +1438,7 @@ func TestValidateAuthorizationConfiguration(t *testing.T) {
ConnectionInfo: api.WebhookConnectionInfo{ ConnectionInfo: api.WebhookConnectionInfo{
Type: "InClusterConfig", Type: "InClusterConfig",
}, },
MatchConditions: []api.WebhookMatchCondition{{Expression: "true"}},
}, },
}, },
}, },