Add skipmap flag to skip validation for AdditionlPropperties

Author: Liujingfang1

cmd/internal/codegen/parse/crd.go

@@ -215,28 +215,36 @@ func (b *APIs) parsePrimitiveValidation(t *types.Type, found sets.String, commen
 	return props, buff.String()
 }
 
+type mapTempateArgs struct {
+	Result string
+	SkipMap bool
+}
+
 var mapTemplate = template.Must(template.New("map-template").Parse(
 	`v1beta1.JSONSchemaProps{
     Type:                 "object",
-    AdditionalProperties: &v1beta1.JSONSchemaPropsOrBool{
+    {{if not .SkipMap}}AdditionalProperties: &v1beta1.JSONSchemaPropsOrBool{
         Allows: true,
-        //Schema: &{{.}},
-    },
+        Schema: &{{.Result}},
+    },{{end}}
 }`))
 
 // parseMapValidation returns a JSONSchemaProps object and its serialization in
 // Go that describe the validations for the given map type.
 func (b *APIs) parseMapValidation(t *types.Type, found sets.String, comments []string) (v1beta1.JSONSchemaProps, string) {
-	additionalProps, _ := b.typeToJSONSchemaProps(t.Elem, found, comments)
+	additionalProps, result := b.typeToJSONSchemaProps(t.Elem, found, comments)
 	props := v1beta1.JSONSchemaProps{
 		Type: "object",
-		AdditionalProperties: &v1beta1.JSONSchemaPropsOrBool{
+	}
+    parseOption := b.arguments.CustomArgs.(*ParseOptions)
+	if !parseOption.SkipMap {
+		props.AdditionalProperties = &v1beta1.JSONSchemaPropsOrBool{
 			Allows: true,
-			Schema: &additionalProps},
+			Schema: &additionalProps}
 	}
 
 	buff := &bytes.Buffer{}
-	if err := mapTemplate.Execute(buff, ""); err != nil {
+	if err := mapTemplate.Execute(buff, mapTempateArgs{result, parseOption.SkipMap}); err != nil {
 		log.Fatalf("%v", err)
 	}
 	return props, buff.String()

cmd/internal/codegen/parse/util.go

@@ -26,6 +26,10 @@ import (
 	"k8s.io/gengo/types"
 )
 
+type ParseOptions struct {
+    SkipMap bool
+}
+
 // IsAPIResource returns true if t has a +resource/+kubebuilder:resource comment tag
 func IsAPIResource(t *types.Type) bool {
 	for _, c := range t.CommentLines {

cmd/kubebuilder-gen/codegen/run/generator.go

@@ -22,6 +22,7 @@ import (
 	"github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder-gen/codegen"
 	"k8s.io/gengo/args"
 	"k8s.io/gengo/generator"
+	"github.com/spf13/pflag"
 )
 
 // CodeGenerator generates code for Kubernetes resources and controllers
@@ -45,12 +46,16 @@ func (g *CodeGenerator) AddResourceGenerator(generator codegen.ResourceGenerator
 	return g
 }
 
-type customArgs struct{}
-
 // Execute parses packages and executes the code generators against the resource and controller packages
 func (g *CodeGenerator) Execute() error {
 	arguments := args.Default()
-	arguments.CustomArgs = &customArgs{}
+
+	// Custom args.
+	customArgs := &parse.ParseOptions{}
+	pflag.CommandLine.BoolVar(&customArgs.SkipMap, "skip-map", true,
+		"If set true, skip map types.")
+	arguments.CustomArgs = customArgs
+
 	arguments.OutputFileBaseName = g.OutputFileBaseName
 
 	err := arguments.Execute(parse.NameSystems(), parse.DefaultNameSystem(), g.packages)

cmd/kubebuilder/create/config/gen.go

@@ -67,6 +67,8 @@ func (g CodeGenerator) Execute() error {
 		return fmt.Errorf("Failed making a context: %v", err)
 	}
 
+	arguments.CustomArgs = &parse.ParseOptions{SkipMap: true}
+
 	p := parse.NewAPIs(c, arguments)
 	if crds {
 		util.WriteString(output, strings.Join(getCrds(p), "---\n"))

cmd/kubebuilder/docs/gen.go

@@ -32,6 +32,8 @@ func (g CodeGenerator) Execute(dir string) error {
 		return fmt.Errorf("Failed making a context: %v", err)
 	}
 
+	arguments.CustomArgs = &parse.ParseOptions{SkipMap: true}
+
 	p := parse.NewAPIs(c, arguments)
 	path := filepath.Join(dir, outputDir, "config.yaml")