apiextensions: fixup go-openapi constructor invocations

sttts · sttts · commit 788088936bc2 · 2019-11-20T18:33:45.000+01:00
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go
@@ -713,7 +713,7 @@ func (r *crdHandler) getOrCreateServingInfoFor(uid types.UID, name string) (*crd
 					if err := apiservervalidation.ConvertJSONSchemaPropsWithPostProcess(&statusSchema, openapiSchema, apiservervalidation.StripUnsupportedFormatsPostProcess); err != nil {
 						return nil, err
 					}
-					statusValidator = validate.NewSchemaValidator(openapiSchema, nil, "", strfmt.Default, validate.DisableObjectArrayTypeCheck(true))
+					statusValidator = validate.NewSchemaValidator(openapiSchema, nil, "", strfmt.Default)
 				}
 			}
 		}
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/validation/validation.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/validation/validation.go
@@ -39,7 +39,7 @@ func NewSchemaValidator(customResourceValidation *apiextensions.CustomResourceVa
 			return nil, nil, err
 		}
 	}
-	return validate.NewSchemaValidator(openapiSchema, nil, "", strfmt.Default, validate.DisableObjectArrayTypeCheck(true)), openapiSchema, nil
+	return validate.NewSchemaValidator(openapiSchema, nil, "", strfmt.Default), openapiSchema, nil
 }
 
 // ValidateCustomResource validates the Custom Resource against the schema in the CustomResourceDefinition.

Original file line number	Diff line number	Diff line change
`@@ -713,7 +713,7 @@ func (r crdHandler) getOrCreateServingInfoFor(uid types.UID, name string) (crd`
`713`	`713`	`if err := apiservervalidation.ConvertJSONSchemaPropsWithPostProcess(&statusSchema, openapiSchema, apiservervalidation.StripUnsupportedFormatsPostProcess); err != nil {`
`714`	`714`	`return nil, err`
`715`	`715`	`}`
`716`		`- statusValidator = validate.NewSchemaValidator(openapiSchema, nil, "", strfmt.Default, validate.DisableObjectArrayTypeCheck(true))`
	`716`	`+ statusValidator = validate.NewSchemaValidator(openapiSchema, nil, "", strfmt.Default)`
`717`	`717`	`}`
`718`	`718`	`}`
`719`	`719`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ func NewSchemaValidator(customResourceValidation *apiextensions.CustomResourceVa`
`39`	`39`	`return nil, nil, err`
`40`	`40`	`}`
`41`	`41`	`}`
`42`		`- return validate.NewSchemaValidator(openapiSchema, nil, "", strfmt.Default, validate.DisableObjectArrayTypeCheck(true)), openapiSchema, nil`
	`42`	`+ return validate.NewSchemaValidator(openapiSchema, nil, "", strfmt.Default), openapiSchema, nil`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`// ValidateCustomResource validates the Custom Resource against the schema in the CustomResourceDefinition.`