diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index a3c412ae8d8..21ba6594352 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -319,6 +319,55 @@ return a valid PreferredVersion unless the group suffix is example.com. release: v1.19 file: test/e2e/apimachinery/discovery.go +- testname: Server side field validation, unknown fields CR no validation schema + codename: '[sig-api-machinery] FieldValidation should create/apply a CR with unknown + fields for CRD with no validation schema [Conformance]' + description: When a CRD does not have a validation schema, it should succeed when + a CR with unknown fields is applied. + release: v1.27 + file: test/e2e/apimachinery/field_validation.go +- testname: Server side field validation, valid CR with validation schema + codename: '[sig-api-machinery] FieldValidation should create/apply a valid CR for + CRD with validation schema [Conformance]' + description: When a CRD has a validation schema, it should succeed when a valid + CR is applied. + release: v1.27 + file: test/e2e/apimachinery/field_validation.go +- testname: Server side field validation, unknown fields CR fails validation + codename: '[sig-api-machinery] FieldValidation should create/apply an invalid CR + with extra properties for CRD with validation schema [Conformance]' + description: When a CRD does have a validation schema, it should reject CRs with + unknown fields. + release: v1.27 + file: test/e2e/apimachinery/field_validation.go +- testname: Server side field validation, CR duplicates + codename: '[sig-api-machinery] FieldValidation should detect duplicates in a CR + when preserving unknown fields [Conformance]' + description: The server should reject CRs with duplicate fields even when preserving + unknown fields. + release: v1.27 + file: test/e2e/apimachinery/field_validation.go +- testname: Server side field validation, typed object + codename: '[sig-api-machinery] FieldValidation should detect unknown and duplicate + fields of a typed object [Conformance]' + description: It should reject the request if a typed object has unknown or duplicate + fields. + release: v1.27 + file: test/e2e/apimachinery/field_validation.go +- testname: Server side field validation, unknown metadata + codename: '[sig-api-machinery] FieldValidation should detect unknown metadata fields + in both the root and embedded object of a CR [Conformance]' + description: The server should reject CRs with unknown metadata fields in both the + root and embedded objects of a CR. + release: v1.27 + file: test/e2e/apimachinery/field_validation.go +- testname: Server side field validation, typed unknown metadata + codename: '[sig-api-machinery] FieldValidation should detect unknown metadata fields + of a typed object [Conformance]' + description: It should reject the request if a typed object has unknown fields in + the metadata. + release: v1.27 + file: test/e2e/apimachinery/field_validation.go - testname: Garbage Collector, delete deployment, propagation policy background codename: '[sig-api-machinery] Garbage collector should delete RS created by deployment when not orphaning [Conformance]' diff --git a/test/e2e/apimachinery/field_validation.go b/test/e2e/apimachinery/field_validation.go index 511bd93f9fa..5ff9041ca90 100644 --- a/test/e2e/apimachinery/field_validation.go +++ b/test/e2e/apimachinery/field_validation.go @@ -61,7 +61,7 @@ var _ = SIGDescribe("FieldValidation", func() { Testname: Server side field validation, typed object Description: It should reject the request if a typed object has unknown or duplicate fields. */ - ginkgo.It("should detect unknown and duplicate fields of a typed object", func(ctx context.Context) { + framework.ConformanceIt("should detect unknown and duplicate fields of a typed object", func(ctx context.Context) { ginkgo.By("apply creating a deployment") invalidMetaDeployment := `{ "apiVersion": "apps/v1", @@ -114,7 +114,7 @@ var _ = SIGDescribe("FieldValidation", func() { Testname: Server side field validation, typed unknown metadata Description: It should reject the request if a typed object has unknown fields in the metadata. */ - ginkgo.It("should detect unknown metadata fields of a typed object", func(ctx context.Context) { + framework.ConformanceIt("should detect unknown metadata fields of a typed object", func(ctx context.Context) { ginkgo.By("apply creating a deployment") invalidMetaDeployment := `{ "apiVersion": "apps/v1", @@ -165,7 +165,7 @@ var _ = SIGDescribe("FieldValidation", func() { Testname: Server side field validation, valid CR with validation schema Description: When a CRD has a validation schema, it should succeed when a valid CR is applied. */ - ginkgo.It("should create/apply a valid CR for CRD with validation schema", func(ctx context.Context) { + framework.ConformanceIt("should create/apply a valid CR for CRD with validation schema", func(ctx context.Context) { config, err := framework.LoadConfig() if err != nil { framework.Failf("%s", err) @@ -283,7 +283,7 @@ spec: Testname: Server side field validation, unknown fields CR no validation schema Description: When a CRD does not have a validation schema, it should succeed when a CR with unknown fields is applied. */ - ginkgo.It("should create/apply a CR with unknown fields for CRD with no validation schema", func(ctx context.Context) { + framework.ConformanceIt("should create/apply a CR with unknown fields for CRD with no validation schema", func(ctx context.Context) { config, err := framework.LoadConfig() if err != nil { framework.Failf("%s", err) @@ -341,7 +341,7 @@ spec: Testname: Server side field validation, unknown fields CR fails validation Description: When a CRD does have a validation schema, it should reject CRs with unknown fields. */ - ginkgo.It("should create/apply an invalid CR with extra properties for CRD with validation schema", func(ctx context.Context) { + framework.ConformanceIt("should create/apply an invalid CR with extra properties for CRD with validation schema", func(ctx context.Context) { config, err := framework.LoadConfig() if err != nil { framework.Failf("%s", err) @@ -462,7 +462,7 @@ spec: Description: The server should reject CRs with unknown metadata fields in both the root and embedded objects of a CR. */ - ginkgo.It("should detect unknown metadata fields in both the root and embedded object of a CR", func(ctx context.Context) { + framework.ConformanceIt("should detect unknown metadata fields in both the root and embedded object of a CR", func(ctx context.Context) { config, err := framework.LoadConfig() if err != nil { framework.Failf("%s", err) @@ -607,7 +607,7 @@ spec: Testname: Server side field validation, CR duplicates Description: The server should reject CRs with duplicate fields even when preserving unknown fields. */ - ginkgo.It("should detect duplicates in a CR when preserving unknown fields", func(ctx context.Context) { + framework.ConformanceIt("should detect duplicates in a CR when preserving unknown fields", func(ctx context.Context) { config, err := framework.LoadConfig() if err != nil { framework.Failf("%s", err)