-
Notifications
You must be signed in to change notification settings - Fork 993
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
webhook(hypernode): validate memberSelectorType
Signed-off-by: xuwentao <cutenear1993@yahoo.com>
- Loading branch information
Showing
5 changed files
with
215 additions
and
3 deletions.
There are no files selected for viewing
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
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
99 changes: 99 additions & 0 deletions
99
pkg/webhooks/admission/hypernodes/validate/admit_hypernode.go
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| /* | ||
| Copyright 2024 The Volcano Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package validate | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| admissionv1 "k8s.io/api/admission/v1" | ||
| whv1 "k8s.io/api/admissionregistration/v1" | ||
| "k8s.io/klog/v2" | ||
|
|
||
| hypernodev1alpha1 "volcano.sh/apis/pkg/apis/topology/v1alpha1" | ||
| "volcano.sh/volcano/pkg/webhooks/router" | ||
| "volcano.sh/volcano/pkg/webhooks/schema" | ||
| "volcano.sh/volcano/pkg/webhooks/util" | ||
| ) | ||
|
|
||
| var config = &router.AdmissionServiceConfig{} | ||
|
|
||
| var service = &router.AdmissionService{ | ||
| Path: "/hypernodes/validate", | ||
| Func: AdmitHyperNode, | ||
|
|
||
| Config: config, | ||
|
|
||
| ValidatingConfig: &whv1.ValidatingWebhookConfiguration{ | ||
| Webhooks: []whv1.ValidatingWebhook{{ | ||
| Name: "validatehypernode.volcano.sh", | ||
| Rules: []whv1.RuleWithOperations{ | ||
| { | ||
| Operations: []whv1.OperationType{whv1.Create, whv1.Update}, | ||
| Rule: whv1.Rule{ | ||
| APIGroups: []string{hypernodev1alpha1.SchemeGroupVersion.Group}, | ||
| APIVersions: []string{hypernodev1alpha1.SchemeGroupVersion.Version}, | ||
| Resources: []string{"hypernodes"}, | ||
| }, | ||
| }, | ||
| }, | ||
| }}, | ||
| }, | ||
| } | ||
|
|
||
| func init() { | ||
| router.RegisterAdmission(service) | ||
| } | ||
|
|
||
| // AdmitHyperNode is to admit hypernode and return response. | ||
| // Reference: https://github.com/volcano-sh/volcano/issues/3883 | ||
| func AdmitHyperNode(ar admissionv1.AdmissionReview) *admissionv1.AdmissionResponse { | ||
| klog.V(3).Infof("admitting hypernode -- %s", ar.Request.Operation) | ||
|
|
||
| hypernode, err := schema.DecodeHyperNode(ar.Request.Object, ar.Request.Resource) | ||
| if err != nil { | ||
| return util.ToAdmissionResponse(err) | ||
| } | ||
|
|
||
| switch ar.Request.Operation { | ||
| case admissionv1.Create, admissionv1.Update: | ||
| err = validateHyperNode(hypernode) | ||
| if err != nil { | ||
| return util.ToAdmissionResponse(err) | ||
| } | ||
| } | ||
| return &admissionv1.AdmissionResponse{ | ||
| Allowed: true, | ||
| } | ||
| } | ||
|
|
||
| // validateHyperNode is to validate hypernode members | ||
| func validateHyperNode(hypernode *hypernodev1alpha1.HyperNode) error { | ||
| if len(hypernode.Spec.Members) == 0 { | ||
| return nil | ||
| } | ||
|
|
||
| for _, member := range hypernode.Spec.Members { | ||
| if member.Selector.ExactMatch == nil && member.Selector.RegexMatch == nil { | ||
| return fmt.Errorf("either exactMatch or regexMatch must be specified") | ||
| } | ||
|
|
||
| if member.Selector.ExactMatch != nil && member.Selector.RegexMatch != nil { | ||
| return fmt.Errorf("exactMatch and regexMatch cannot be specified together") | ||
| } | ||
| } | ||
| return nil | ||
| } |
91 changes: 91 additions & 0 deletions
91
pkg/webhooks/admission/hypernodes/validate/admit_hypernode_test.go
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /* | ||
| Copyright 2024 The Volcano Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package validate | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| hypernodev1alpha1 "volcano.sh/apis/pkg/apis/topology/v1alpha1" | ||
| ) | ||
|
|
||
| func TestValidateHyperNodeMembers(t *testing.T) { | ||
| testCases := []struct { | ||
| Name string | ||
| HyperNode *hypernodev1alpha1.HyperNode | ||
| ExpectErr string | ||
| }{ | ||
| { | ||
| Name: "validate valid hypernode", | ||
| HyperNode: &hypernodev1alpha1.HyperNode{ | ||
| Spec: hypernodev1alpha1.HyperNodeSpec{ | ||
| Members: []hypernodev1alpha1.MemberSpec{ | ||
| { | ||
| Selector: hypernodev1alpha1.MemberSelector{ | ||
| ExactMatch: &hypernodev1alpha1.ExactMatch{ | ||
| Name: "node-1", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| ExpectErr: "", | ||
| }, | ||
| { | ||
| Name: "validate invalid hypernode with empty selector", | ||
| HyperNode: &hypernodev1alpha1.HyperNode{ | ||
| Spec: hypernodev1alpha1.HyperNodeSpec{ | ||
| Members: []hypernodev1alpha1.MemberSpec{ | ||
| { | ||
| Selector: hypernodev1alpha1.MemberSelector{}, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| ExpectErr: "either exactMatch or regexMatch must be specified", | ||
| }, | ||
| { | ||
| Name: "validate invalid hypernode with both exactMatch and regexMatch", | ||
| HyperNode: &hypernodev1alpha1.HyperNode{ | ||
| Spec: hypernodev1alpha1.HyperNodeSpec{ | ||
| Members: []hypernodev1alpha1.MemberSpec{ | ||
| { | ||
| Selector: hypernodev1alpha1.MemberSelector{ | ||
| ExactMatch: &hypernodev1alpha1.ExactMatch{ | ||
| Name: "node-1", | ||
| }, | ||
| RegexMatch: &hypernodev1alpha1.RegexMatch{ | ||
| Pattern: "node-1", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| ExpectErr: "exactMatch and regexMatch cannot be specified together", | ||
| }, | ||
| } | ||
|
|
||
| for _, testCase := range testCases { | ||
| t.Run(testCase.Name, func(t *testing.T) { | ||
| err := validateHyperNode(testCase.HyperNode) | ||
| if err != nil && err.Error() != testCase.ExpectErr { | ||
| t.Errorf("validateHyperNodeLabels failed: %v", err) | ||
| } | ||
| }) | ||
| } | ||
| } |
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