github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #107688 from liggitt/prune-array

Browse Source 
Fix regression pruning array fields with x-kubernetes-preserve-unknown-fields: true
This commit is contained in:
Kubernetes Prow Robot 2022-01-21 19:55:52 -08:00 committed by GitHub
commit 05701a1309
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 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/pruning/algorithm.go
View File

@ -189,7 +189,7 @@ func skipPrune(x interface{}, s *structuralschema.Structural, opts *PruneOptions
case []interface{}: case []interface{}:
for i, v := range x { for i, v := range x {
opts.appendIndex(i) opts.appendIndex(i)
prune(v, s.Items, opts) skipPrune(v, s.Items, opts)
opts.parentPath = opts.parentPath[:origPathLen] opts.parentPath = opts.parentPath[:origPathLen]
} }
default: default:

10
staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/pruning/algorithm_test.go
View File

@ -88,7 +88,8 @@ func TestPrune(t *testing.T) {
"unspecified": "bar", "unspecified": "bar",
"unspecifiedObject": {"unspecified": "bar"}, "unspecifiedObject": {"unspecified": "bar"},
"pruning": {"unspecified": "bar"}, "pruning": {"unspecified": "bar"},
"preserving": {"unspecified": "bar"} "preserving": {"unspecified": "bar"},
"preservingUnknownType": [{"foo":true},{"bar":true}]
}, },
"preservingAdditionalPropertiesNotInheritingXPreserveUnknownFields": { "preservingAdditionalPropertiesNotInheritingXPreserveUnknownFields": {
"foo": { "foo": {
@ -129,6 +130,10 @@ func TestPrune(t *testing.T) {
Generic: structuralschema.Generic{Type: "object"}, Generic: structuralschema.Generic{Type: "object"},
Extensions: structuralschema.Extensions{XPreserveUnknownFields: true}, Extensions: structuralschema.Extensions{XPreserveUnknownFields: true},
}, },
"preservingUnknownType": {
Generic: structuralschema.Generic{Type: ""},
Extensions: structuralschema.Extensions{XPreserveUnknownFields: true},
},
"pruning": { "pruning": {
Generic: structuralschema.Generic{Type: "object"}, Generic: structuralschema.Generic{Type: "object"},
}, },
@ -177,7 +182,8 @@ func TestPrune(t *testing.T) {
"unspecified": "bar", "unspecified": "bar",
"unspecifiedObject": {"unspecified": "bar"}, "unspecifiedObject": {"unspecified": "bar"},
"pruning": {}, "pruning": {},
"preserving": {"unspecified": "bar"} "preserving": {"unspecified": "bar"},
"preservingUnknownType": [{"foo":true},{"bar":true}]
}, },
"preservingAdditionalPropertiesNotInheritingXPreserveUnknownFields": { "preservingAdditionalPropertiesNotInheritingXPreserveUnknownFields": {
"foo": { "foo": {