github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

apiextension: fix structural additionalProperties in ToOpenAPI()

Browse Source
This commit is contained in:
Dr. Stefan Schimanski 2019-08-23 18:47:09 +02:00
parent a1f1f0b599
commit b91640816d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/convert.go
View File

@ -114,7 +114,7 @@ func newGenerics(s *apiextensions.JSONSchemaProps) (*Generic, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
g.AdditionalProperties = &StructuralOrBool{Structural: ss} g.AdditionalProperties = &StructuralOrBool{Structural: ss, Bool: true}
} else { } else {
g.AdditionalProperties = &StructuralOrBool{Bool: s.AdditionalProperties.Allows} g.AdditionalProperties = &StructuralOrBool{Bool: s.AdditionalProperties.Allows}
} }

2
staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/v2/conversion_test.go
View File

@ -492,7 +492,7 @@ func Test_ConvertJSONSchemaPropsToOpenAPIv2SchemaByType(t *testing.T) {
expected: &spec.Schema{ expected: &spec.Schema{
SchemaProps: spec.SchemaProps{ SchemaProps: spec.SchemaProps{
AdditionalProperties: &spec.SchemaOrBool{ AdditionalProperties: &spec.SchemaOrBool{
Allows: false, Allows: true,
Schema: spec.BooleanProperty(), Schema: spec.BooleanProperty(),
}, },
}, },