Skip to content

Commit 16e0976

Browse files
authored
Merge pull request kubernetes#84861 from sttts/sttts-crd-defaulting-conformance
e2e: promote CRD defaulting test to conformance test
2 parents 09d142a + 69282dc commit 16e0976

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

test/conformance/testdata/conformance.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ test/e2e/apimachinery/custom_resource_definition.go: "creating/deleting custom r
1515
test/e2e/apimachinery/custom_resource_definition.go: "listing custom resource definition objects works"
1616
test/e2e/apimachinery/custom_resource_definition.go: "getting/updating/patching custom resource definition status sub-resource works"
1717
test/e2e/apimachinery/custom_resource_definition.go: "should include custom resource definition resources in discovery documents"
18+
test/e2e/apimachinery/custom_resource_definition.go: "custom resource defaulting for requests and from storage works"
1819
test/e2e/apimachinery/garbage_collector.go: "should delete pods created by rc when not orphaning"
1920
test/e2e/apimachinery/garbage_collector.go: "should orphan pods created by rc if delete options say so"
2021
test/e2e/apimachinery/garbage_collector.go: "should delete RS created by deployment when not orphaning"

test/e2e/apimachinery/custom_resource_definition.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ var _ = SIGDescribe("CustomResourceDefinition resources [Privileged:ClusterAdmin
264264
the default is applied. Create another CR. Remove default, add default for another field and read CR until
265265
new field is defaulted, but old default stays.
266266
*/
267-
ginkgo.It("custom resource defaulting for requests and from storage works ", func() {
267+
framework.ConformanceIt("custom resource defaulting for requests and from storage works ", func() {
268268
config, err := framework.LoadConfig()
269269
framework.ExpectNoError(err, "loading config")
270270
apiExtensionClient, err := clientset.NewForConfig(config)

0 commit comments

Comments
 (0)