From 0a19b5ab6e276aaf4022ee58b3b539c41933cd2a Mon Sep 17 00:00:00 2001 From: Alexander Zielenski Date: Mon, 23 Oct 2023 18:11:40 -0700 Subject: [PATCH] fix usage --- .../pkg/apiserver/schema/defaulting/validation.go | 5 +---- .../pkg/apiserver/validation/validation.go | 8 ++++++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/defaulting/validation.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/defaulting/validation.go index cd7c6e07558..02945b14f4c 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/defaulting/validation.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/defaulting/validation.go @@ -21,9 +21,6 @@ import ( "fmt" "reflect" - "k8s.io/kube-openapi/pkg/validation/strfmt" - kubeopenapivalidate "k8s.io/kube-openapi/pkg/validation/validate" - structuralschema "k8s.io/apiextensions-apiserver/pkg/apiserver/schema" "k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel" schemaobjectmeta "k8s.io/apiextensions-apiserver/pkg/apiserver/schema/objectmeta" @@ -74,7 +71,7 @@ func validate(ctx context.Context, pth *field.Path, s *structuralschema.Structur isResourceRoot := s == rootSchema if s.Default.Object != nil { - validator := kubeopenapivalidate.NewSchemaValidator(s.ToKubeOpenAPI(), nil, "", strfmt.Default) + validator := apiservervalidation.NewSchemaValidatorFromOpenAPI(s.ToKubeOpenAPI()) if insideMeta { obj, _, err := f(runtime.DeepCopyJSONValue(s.Default.Object)) 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 3fc9965fb9a..7304018fb34 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 @@ -106,11 +106,15 @@ func NewSchemaValidator(customResourceValidation *apiextensions.JSONSchemaProps) return nil, nil, err } } + return NewSchemaValidatorFromOpenAPI(openapiSchema), openapiSchema, nil +} +func NewSchemaValidatorFromOpenAPI(openapiSchema *spec.Schema) SchemaValidator { if utilfeature.DefaultFeatureGate.Enabled(features.CRDValidationRatcheting) { - return NewRatchetingSchemaValidator(openapiSchema, nil, "", strfmt.Default), openapiSchema, nil + return NewRatchetingSchemaValidator(openapiSchema, nil, "", strfmt.Default) } - return basicSchemaValidator{validate.NewSchemaValidator(openapiSchema, nil, "", strfmt.Default)}, openapiSchema, nil + return basicSchemaValidator{validate.NewSchemaValidator(openapiSchema, nil, "", strfmt.Default)} + } // ValidateCustomResourceUpdate validates the transition of Custom Resource from