Merge branch 'master' into crd-schema-primitive-types

Author: Phillip Wittrock

cmd/internal/codegen/parse/crd.go

@@ -266,7 +266,10 @@ func (b *APIs) parseMapValidation(t *types.Type, found sets.String, comments []s
 
 var arrayTemplate = template.Must(template.New("array-template").Parse(
 	`v1beta1.JSONSchemaProps{
-    Type:                 "array",
+    Type:                 "{{.Type}}",
+    {{ if .Format -}}
+    Format: "{{.Format}}",
+    {{ end -}}
     {{ if .MaxItems -}}
     MaxItems: getInt({{ .MaxItems }}),
     {{ end -}}
@@ -276,9 +279,11 @@ var arrayTemplate = template.Must(template.New("array-template").Parse(
     {{ if .UniqueItems -}}
     UniqueItems: {{ .UniqueItems }},
     {{ end -}}
+    {{ if .Items -}}
     Items: &v1beta1.JSONSchemaPropsOrArray{
         Schema: &{{.ItemsSchema}},
     },
+    {{ end -}}
 }`))
 
 type arrayTemplateArgs struct {
@@ -294,6 +299,13 @@ func (b *APIs) parseArrayValidation(t *types.Type, found sets.String, comments [
 		Type:  "array",
 		Items: &v1beta1.JSONSchemaPropsOrArray{Schema: &items},
 	}
+	// To represent byte arrays in the generated code, the property of the OpenAPI definition
+	// should have string as its type and byte as its format.
+	if t.Name.Name == "[]byte" {
+		props.Type = "string"
+		props.Format = "byte"
+		props.Items = nil
+	}
 	for _, l := range comments {
 		getValidation(l, &props)
 	}

test.sh

@@ -531,6 +531,7 @@ function test_crd_validation {
     Alias string \`json:"alias"\`\
     // +kubebuilder:validation:Enum=1,2,3\
     Rank int \`json:"rank"\`\
+    Comment []byte \`json:"comment,omitempty"\`\
   ' pkg/apis/got/v1beta1/house_types.go
 
   kubebuilder generate

test/data/resource/expected/crd-expected.yaml

@@ -32,6 +32,9 @@ spec:
             bricks:
               format: int32
               type: integer
+            comment:
+              format: byte
+              type: string
             knights:
               items:
                 type: string