From 788088936bc2971bd213f71550d976f815045702 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Wed, 13 Nov 2019 17:33:05 +0100 Subject: [PATCH] apiextensions: fixup go-openapi constructor invocations --- .../pkg/apiserver/customresource_handler.go | 2 +- .../pkg/apiserver/validation/validation.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 index 4f459f25ee1..4e15edd708d 100644 --- 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 index d8944c6e9bc..fd661f92640 100644 --- 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.