Merge pull request #317 from knight42/fix

✨ add support for pointers as map values

Author: k8s-ci-robot

pkg/crd/schema.go

@@ -297,6 +297,8 @@ func mapToSchema(ctx *schemaContext, mapType *ast.MapType) *apiext.JSONSchemaPro
 			ctx.pkg.AddError(loader.ErrFromNode(fmt.Errorf("map values must be a named type, not %T", mapType.Value), mapType.Value))
 			return &apiext.JSONSchemaProps{}
 		}
+	case *ast.StarExpr:
+		valSchema = typeToSchema(ctx.ForInfo(&markers.TypeInfo{}), val)
 	default:
 		ctx.pkg.AddError(loader.ErrFromNode(fmt.Errorf("map values must be a named type, not %T", mapType.Value), mapType.Value))
 		return &apiext.JSONSchemaProps{}

pkg/crd/testdata/cronjob_types.go

@@ -91,6 +91,9 @@ type CronJobSpec struct {
 	// This tests string slices are allowed as map values.
 	StringSliceData map[string][]string `json:"stringSliceData,omitempty"`
 
+	// This tests pointers are allowed as map values.
+	PtrData map[string]*string `json:"ptrData,omitempty"`
+
 	// This tests that markers that are allowed on both fields and types are applied to fields
 	// +kubebuilder:validation:MinLength=4
 	TwoOfAKindPart0 string `json:"twoOfAKindPart0"`

pkg/crd/testdata/testdata.kubebuilder.io_cronjobs.yaml

@@ -5038,6 +5038,11 @@ spec:
                 description: This tests that pattern validator is properly applied.
                 pattern: ^$|^((https):\/\/?)[^\s()<>]+(?:\([\w\d]+\)|([^[:punct:]\s]|\/?))$
                 type: string
+              ptrData:
+                additionalProperties:
+                  type: string
+                description: This tests pointers are allowed as map values.
+                type: object
               schedule:
                 description: The schedule in Cron format, see https://en.wikipedia.org/wiki/Cron.
                 type: string