UPSTREAM: <carry>: ValidateTolerations function now takes a PodValidationOptions argument

jacobsee · jacobsee · commit 073178746083 · 2025-12-10T18:16:56.000-08:00
squash into ‘add openshift-kube-apiserver’
diff --git a/openshift-kube-apiserver/admission/customresourcevalidation/dns/validate_dns.go b/openshift-kube-apiserver/admission/customresourcevalidation/dns/validate_dns.go
@@ -143,7 +143,7 @@ func validateTolerations(versionedTolerations []corev1.Toleration, fldPath *fiel
 			allErrors = append(allErrors, field.Invalid(fldPath.Index(i), unversionedTolerations[i], err.Error()))
 		}
 	}
-	allErrors = append(allErrors, apivalidation.ValidateTolerations(unversionedTolerations, fldPath)...)
+	allErrors = append(allErrors, apivalidation.ValidateTolerations(unversionedTolerations, fldPath, apivalidation.PodValidationOptions{})...)
 	return allErrors
 }
 

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ func validateTolerations(versionedTolerations []corev1.Toleration, fldPath *fiel`
`143`	`143`	`allErrors = append(allErrors, field.Invalid(fldPath.Index(i), unversionedTolerations[i], err.Error()))`
`144`	`144`	`}`
`145`	`145`	`}`
`146`		`- allErrors = append(allErrors, apivalidation.ValidateTolerations(unversionedTolerations, fldPath)...)`
	`146`	`+ allErrors = append(allErrors, apivalidation.ValidateTolerations(unversionedTolerations, fldPath, apivalidation.PodValidationOptions{})...)`
`147`	`147`	`return allErrors`
`148`	`148`	`}`
`149`	`149`