Skip to content

Commit f0036aa

Browse files
authored
Merge pull request kubernetes#127572 from soltysh/reuse_helper
Reuse CreateTestCRD helper for kubectl e2e
2 parents 4851ea8 + b51d630 commit f0036aa

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

test/e2e/kubectl/kubectl.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,7 +1235,7 @@ metadata:
12351235

12361236
ginkgo.It("should detect unknown metadata fields in both the root and embedded object of a CR", func(ctx context.Context) {
12371237
ginkgo.By("prepare CRD with x-kubernetes-embedded-resource: true")
1238-
opt := func(crd *apiextensionsv1.CustomResourceDefinition) {
1238+
testCRD, err := crd.CreateTestCRD(f, func(crd *apiextensionsv1.CustomResourceDefinition) {
12391239
props := &apiextensionsv1.JSONSchemaProps{}
12401240
if err := yaml.Unmarshal(schemaFooEmbedded, props); err != nil {
12411241
framework.Failf("failed to unmarshal schema: %v", err)
@@ -1250,10 +1250,7 @@ metadata:
12501250
},
12511251
},
12521252
}
1253-
}
1254-
1255-
group := fmt.Sprintf("%s.example.com", f.BaseName)
1256-
testCRD, err := crd.CreateMultiVersionTestCRD(f, group, opt)
1253+
})
12571254
if err != nil {
12581255
framework.Failf("failed to create test CRD: %v", err)
12591256
}

0 commit comments

Comments
 (0)