admission(hypernode) fit new version of apis

volcano-sh · Dec 18, 2024 · b86c1a4 · b86c1a4
1 parent 8f8a935
commit b86c1a4
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 36 deletions.
diff --git a/pkg/webhooks/admission/hypernodes/validate/admit_hypernode.go b/pkg/webhooks/admission/hypernodes/validate/admit_hypernode.go
@@ -83,52 +83,44 @@ func AdmitHyperNode(ar admissionv1.AdmissionReview) *admissionv1.AdmissionRespon
 	}
 }
 
-// validateHyperNodeName is to validate hypernode name.
-func validateHyperNodeName(value string, fldPath *field.Path) field.ErrorList {
-	errs := field.ErrorList{}
-	if errMsgs := validation.IsQualifiedName(value); len(errMsgs) > 0 {
-		err := field.Invalid(fldPath, value, fmt.Sprintf("hypernode name must validate failed %v", errMsgs))
-		errs = append(errs, err)
-	}
-	return errs
-}
-
 // validateHyperNodeMemberSelector is to validate hypernode member selector.
 func validateHyperNodeMemberSelector(selector hypernodev1alpha1.MemberSelector, fldPath *field.Path) field.ErrorList {
 	errs := field.ErrorList{}
-	switch selector.Type {
-	case hypernodev1alpha1.ExactMatchMemberSelectorType:
-		if selector.ExactMatch == nil {
-			err := field.Invalid(fldPath.Child("exactMatch"), selector.ExactMatch,
-				fmt.Sprintf("exactMatch is required when type is Exact"))
+
+	if selector.RegexMatch == nil && selector.ExactMatch == nil {
+		err := field.Invalid(fldPath, selector,
+			"member selector must have one of regexMatch or exactMatch")
+		errs = append(errs, err)
+		return errs
+	}
+	if selector.RegexMatch != nil && selector.ExactMatch != nil {
+		err := field.Invalid(fldPath, selector,
+			"member selector cannot have both regexMatch and exactMatch")
+		errs = append(errs, err)
+		return errs
+	}
+	if selector.ExactMatch != nil {
+		if selector.ExactMatch.Name == "" {
+			err := field.Invalid(fldPath.Child("exactMatch").Child("name"),
+				selector.ExactMatch.Name, "member exactMatch name is required")
 			errs = append(errs, err)
-		}
-		if errMsgs := validation.IsQualifiedName(selector.ExactMatch.Name); len(errMsgs) > 0 {
+		} else if errMsgs := validation.IsQualifiedName(selector.ExactMatch.Name); len(errMsgs) > 0 {
 			err := field.Invalid(fldPath.Child("exactMatch").Child("name"),
 				selector.ExactMatch.Name, fmt.Sprintf("member exactMatch validate failed %v", errMsgs))
 			errs = append(errs, err)
 		}
-	case hypernodev1alpha1.RegexMatchMemberSelectorType:
-		if selector.RegexMatch == nil {
-			err := field.Invalid(fldPath, selector.RegexMatch,
-				fmt.Sprintf("regexMatch is required when type is Regex"))
-			errs = append(errs, err)
-		}
+	}
+	if selector.RegexMatch != nil {
 		if selector.RegexMatch.Pattern == "" {
 			err := field.Invalid(fldPath.Child("regexMatch").Child("pattern"),
 				selector.RegexMatch.Pattern, "member regexMatch pattern is required")
 			errs = append(errs, err)
-		}
-		if _, err := regexp.Compile(selector.RegexMatch.Pattern); err != nil {
+		} else if _, err := regexp.Compile(selector.RegexMatch.Pattern); err != nil {
 			err := field.Invalid(fldPath.Child("regexMatch").Child("pattern"),
 				selector.RegexMatch.Pattern, fmt.Sprintf("member regexMatch pattern is invalid: %v", err))
 			errs = append(errs, err)
 		}
-	default:
-		err := field.Invalid(fldPath.Child("type"), selector.Type, fmt.Sprintf("unknown type %s", selector.Type))
-		errs = append(errs, err)
 	}
-
 	return errs
 }
 
@@ -150,9 +142,6 @@ func validateHyperNode(hypernode *hypernodev1alpha1.HyperNode) error {
 	errs := field.ErrorList{}
 	resourcePath := field.NewPath("")
 
-	errs = append(errs, validateHyperNodeName(hypernode.Name,
-		resourcePath.Child("metadata").Child("name"))...)
-
 	for _, member := range hypernode.Spec.Members {
 		errs = append(errs, validateHyperNodeMemberType(member.Type,
 			resourcePath.Child("spec").Child("members").Child("type"))...)

diff --git a/pkg/webhooks/admission/hypernodes/validate/admit_hypernode_test.go b/pkg/webhooks/admission/hypernodes/validate/admit_hypernode_test.go
@@ -41,7 +41,6 @@ func TestValidateHyperNode(t *testing.T) {
 						{
 							Type: hypernodev1alpha1.MemberTypeNode,
 							Selector: hypernodev1alpha1.MemberSelector{
-								Type:       hypernodev1alpha1.ExactMatchMemberSelectorType,
 								ExactMatch: &hypernodev1alpha1.ExactMatch{Name: "node-1"},
 							},
 						},
@@ -61,7 +60,6 @@ func TestValidateHyperNode(t *testing.T) {
 						{
 							Type: hypernodev1alpha1.MemberTypeNode,
 							Selector: hypernodev1alpha1.MemberSelector{
-								Type:       hypernodev1alpha1.ExactMatchMemberSelectorType,
 								ExactMatch: &hypernodev1alpha1.ExactMatch{Name: ""},
 							},
 						},
@@ -81,7 +79,6 @@ func TestValidateHyperNode(t *testing.T) {
 						{
 							Type: hypernodev1alpha1.MemberTypeNode,
 							Selector: hypernodev1alpha1.MemberSelector{
-								Type: hypernodev1alpha1.RegexMatchMemberSelectorType,
 								RegexMatch: &hypernodev1alpha1.RegexMatch{
 									Pattern: "",
 								},
@@ -103,7 +100,6 @@ func TestValidateHyperNode(t *testing.T) {
 						{
 							Type: hypernodev1alpha1.MemberTypeNode,
 							Selector: hypernodev1alpha1.MemberSelector{
-								Type: hypernodev1alpha1.RegexMatchMemberSelectorType,
 								RegexMatch: &hypernodev1alpha1.RegexMatch{
 									Pattern: "a(b",
 								},
@@ -114,6 +110,45 @@ func TestValidateHyperNode(t *testing.T) {
 			},
 			ExpectErr: true,
 		},
+		{
+			Name: "validate invalid hypernode with both regexMatch and exactMatch",
+			HyperNode: hypernodev1alpha1.HyperNode{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "hypernode-1",
+				},
+				Spec: hypernodev1alpha1.HyperNodeSpec{
+					Members: []hypernodev1alpha1.MemberSpec{
+						{
+							Type: hypernodev1alpha1.MemberTypeNode,
+							Selector: hypernodev1alpha1.MemberSelector{
+								RegexMatch: &hypernodev1alpha1.RegexMatch{
+									Pattern: "node.*",
+								},
+								ExactMatch: &hypernodev1alpha1.ExactMatch{Name: "node-1"},
+							},
+						},
+					},
+				},
+			},
+			ExpectErr: true,
+		},
+		{
+			Name: "validate invalid hypernode with niehter regexMatch nor exactMatch",
+			HyperNode: hypernodev1alpha1.HyperNode{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "hypernode-1",
+				},
+				Spec: hypernodev1alpha1.HyperNodeSpec{
+					Members: []hypernodev1alpha1.MemberSpec{
+						{
+							Type:     hypernodev1alpha1.MemberTypeNode,
+							Selector: hypernodev1alpha1.MemberSelector{},
+						},
+					},
+				},
+			},
+			ExpectErr: true,
+		},
 	}
 
 	for _, testCase := range testCases {