Merge pull request #1920 from jackfrancis/validate-max-pods-typed-error

k8s-ci-robot · web-flow · commit f49dc680b71a · 2021-12-13T17:20:02.000-08:00
use api-machinery-typed Error for MaxPods validation
diff --git a/exp/api/v1beta1/azuremanagedmachinepool_webhook.go b/exp/api/v1beta1/azuremanagedmachinepool_webhook.go
@@ -195,7 +195,10 @@ func (r *AzureManagedMachinePool) validateLastSystemNodePool(cli client.Client)
 func (r *AzureManagedMachinePool) validateMaxPods() error {
 	if r.Spec.MaxPods != nil {
 		if to.Int32(r.Spec.MaxPods) < 10 || to.Int32(r.Spec.MaxPods) > 250 {
-			return errors.New("MaxPods must be between 10 and 250")
+			return field.Invalid(
+				field.NewPath("Spec", "MaxPods"),
+				r.Spec.MaxPods,
+				"MaxPods must be between 10 and 250")
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,10 @@ func (r *AzureManagedMachinePool) validateLastSystemNodePool(cli client.Client)`
`195`	`195`	`func (r *AzureManagedMachinePool) validateMaxPods() error {`
`196`	`196`	`if r.Spec.MaxPods != nil {`
`197`	`197`	`if to.Int32(r.Spec.MaxPods) < 10 \|\| to.Int32(r.Spec.MaxPods) > 250 {`
`198`		`- return errors.New("MaxPods must be between 10 and 250")`
	`198`	`+ return field.Invalid(`
	`199`	`+ field.NewPath("Spec", "MaxPods"),`
	`200`	`+ r.Spec.MaxPods,`
	`201`	`+ "MaxPods must be between 10 and 250")`
`199`	`202`	`}`
`200`	`203`	`}`
`201`	`204`