Allow pattern usage for IntOrString fields

kubernetes-sigs · Sep 3, 2021 · 62703ca · 62703ca
1 parent af6ac5f
commit 62703ca
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/pkg/crd/markers/validation.go b/pkg/crd/markers/validation.go
@@ -298,8 +298,11 @@ func (m MinLength) ApplyToSchema(schema *apiext.JSONSchemaProps) error {
 	return nil
 }
 func (m Pattern) ApplyToSchema(schema *apiext.JSONSchemaProps) error {
-	if schema.Type != "string" {
-		return fmt.Errorf("must apply pattern to a string")
+	// Allow string types or IntOrStrings. An IntOrString will still
+	// apply the pattern validation when a string is detected, the pattern
+	// will not apply to ints though.
+	if schema.Type != "string" || schema.XIntOrString {
+		return fmt.Errorf("must apply pattern to a `string` or `IntOrString`")
 	}
 	schema.Pattern = string(m)
 	return nil