Update api/v1beta2/awscluster_webhook.go

krasoffski · AndiDog · web-flow · commit 9027b2e5250f · 2024-10-14T15:52:21.000+02:00
Co-authored-by: Andreas Sommer &lt;andreas.sommer87@googlemail.com&gt;
diff --git a/api/v1beta2/awscluster_webhook.go b/api/v1beta2/awscluster_webhook.go
@@ -268,9 +268,9 @@ func (r *AWSCluster) validateNetwork() field.ErrorList {
 		allErrs = append(allErrs, r.validateIngressRule(rule)...)
 	}
 
-	for _, cidrBlock := range r.Spec.NetworkSpec.NodePortIngressRuleCidrBlocks {
+	for cidrBlockIndex, cidrBlock := range r.Spec.NetworkSpec.NodePortIngressRuleCidrBlocks {
 		if _, _, err := net.ParseCIDR(cidrBlock); err != nil {
-			allErrs = append(allErrs, field.Invalid(field.NewPath("nodePortIngressRuleCidrBlocks"), r.Spec.NetworkSpec.NodePortIngressRuleCidrBlocks, "CIDR block is invalid"))
+			allErrs = append(allErrs, field.Invalid(field.NewPath("spec", "network", fmt.Sprintf("nodePortIngressRuleCidrBlocks[%d]", cidrBlockIndex)), r.Spec.NetworkSpec.NodePortIngressRuleCidrBlocks, "CIDR block is invalid"))
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -268,9 +268,9 @@ func (r *AWSCluster) validateNetwork() field.ErrorList {`
`268`	`268`	`allErrs = append(allErrs, r.validateIngressRule(rule)...)`
`269`	`269`	`}`
`270`	`270`
`271`		`- for _, cidrBlock := range r.Spec.NetworkSpec.NodePortIngressRuleCidrBlocks {`
	`271`	`+ for cidrBlockIndex, cidrBlock := range r.Spec.NetworkSpec.NodePortIngressRuleCidrBlocks {`
`272`	`272`	`if _, _, err := net.ParseCIDR(cidrBlock); err != nil {`
`273`		`- allErrs = append(allErrs, field.Invalid(field.NewPath("nodePortIngressRuleCidrBlocks"), r.Spec.NetworkSpec.NodePortIngressRuleCidrBlocks, "CIDR block is invalid"))`
	`273`	`+ allErrs = append(allErrs, field.Invalid(field.NewPath("spec", "network", fmt.Sprintf("nodePortIngressRuleCidrBlocks[%d]", cidrBlockIndex)), r.Spec.NetworkSpec.NodePortIngressRuleCidrBlocks, "CIDR block is invalid"))`
`274`	`274`	`}`
`275`	`275`	`}`
`276`	`276`