From b91640816d60f2c6d87b7198ab6eaceae545b3ea Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Fri, 23 Aug 2019 18:47:09 +0200 Subject: [PATCH] apiextension: fix structural additionalProperties in ToOpenAPI() --- .../apiextensions-apiserver/pkg/apiserver/schema/convert.go | 2 +- .../pkg/controller/openapi/v2/conversion_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/convert.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/convert.go index 388fb0a47e1..eae33266bf9 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/convert.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/convert.go @@ -114,7 +114,7 @@ func newGenerics(s *apiextensions.JSONSchemaProps) (*Generic, error) { if err != nil { return nil, err } - g.AdditionalProperties = &StructuralOrBool{Structural: ss} + g.AdditionalProperties = &StructuralOrBool{Structural: ss, Bool: true} } else { g.AdditionalProperties = &StructuralOrBool{Bool: s.AdditionalProperties.Allows} } diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/v2/conversion_test.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/v2/conversion_test.go index 1793842af0d..9f98f60185a 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/v2/conversion_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/v2/conversion_test.go @@ -492,7 +492,7 @@ func Test_ConvertJSONSchemaPropsToOpenAPIv2SchemaByType(t *testing.T) { expected: &spec.Schema{ SchemaProps: spec.SchemaProps{ AdditionalProperties: &spec.SchemaOrBool{ - Allows: false, + Allows: true, Schema: spec.BooleanProperty(), }, },