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

Merge pull request #96369 from gautierdelorme/fix-objects-preserve-unknown-fields

Browse Source 
Fix kubectl CRD validation with preserve-unknown-fields objects
This commit is contained in:
Kubernetes Prow Robot 2020-11-12 11:21:03 -08:00 committed by GitHub
commit eb7bc22b95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/builder/builder_test.go
View File

@ -172,8 +172,7 @@ func TestNewBuilder(t *testing.T) {
}, },
"embedded-object": { "embedded-object": {
"x-kubernetes-embedded-resource": true, "x-kubernetes-embedded-resource": true,
"x-kubernetes-preserve-unknown-fields": true, "x-kubernetes-preserve-unknown-fields": true
"type":"object"
} }
}, },
"x-kubernetes-group-version-kind":[{"group":"bar.k8s.io","kind":"Foo","version":"v1"}] "x-kubernetes-group-version-kind":[{"group":"bar.k8s.io","kind":"Foo","version":"v1"}]

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

@ -81,6 +81,13 @@ func ToStructuralOpenAPIV2(in *structuralschema.Structural) *structuralschema.St
changed = true changed = true
} }
if s.XPreserveUnknownFields && s.Type == "object" {
// similar as above, kubectl doesn't properly handle object fields with `x-kubernetes-preserve-unknown-fields: true`
s.Type = ""
changed = true
}
for f, fs := range s.Properties { for f, fs := range s.Properties {
if fs.Nullable { if fs.Nullable {
s.ValueValidation.Required, changed = filterOut(s.ValueValidation.Required, f) s.ValueValidation.Required, changed = filterOut(s.ValueValidation.Required, f)

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

@ -666,8 +666,7 @@ func Test_ConvertJSONSchemaPropsToOpenAPIv2SchemaByType(t *testing.T) {
}, },
}, },
}, },
expected: withVendorExtensions(new(spec.Schema), "x-kubernetes-preserve-unknown-fields", true). expected: withVendorExtensions(new(spec.Schema), "x-kubernetes-preserve-unknown-fields", true),
Typed("object", ""),
}, },
} }

2
test/e2e/apimachinery/crd_publish_openapi.go
View File

@ -231,7 +231,7 @@ var _ = SIGDescribe("CustomResourcePublishOpenAPI [Privileged:ClusterAdmin]", fu
ns := fmt.Sprintf("--namespace=%v", f.Namespace.Name) ns := fmt.Sprintf("--namespace=%v", f.Namespace.Name)
ginkgo.By("client-side validation (kubectl create and apply) allows request with any unknown properties") ginkgo.By("client-side validation (kubectl create and apply) allows request with any unknown properties")
randomCR := fmt.Sprintf(`{%s,"spec":{"b":[{"c":"d"}]}}`, meta) randomCR := fmt.Sprintf(`{%s,"spec":{"a":null,"b":[{"c":"d"}]}}`, meta)
if _, err := framework.RunKubectlInput(f.Namespace.Name, randomCR, ns, "create", "-f", "-"); err != nil { if _, err := framework.RunKubectlInput(f.Namespace.Name, randomCR, ns, "create", "-f", "-"); err != nil {
framework.Failf("failed to create random CR %s for CRD that allows unknown properties in a nested object: %v", randomCR, err) framework.Failf("failed to create random CR %s for CRD that allows unknown properties in a nested object: %v", randomCR, err)
} }