Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Delete CRDs created during field validation tests. #118237

Merged
merged 1 commit into from Jun 7, 2023
Merged

Delete CRDs created during field validation tests. #118237

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 26 additions & 11 deletions test/e2e/apimachinery/field_validation.go
View file
Open in desktop
Expand Up @@ -247,6 +247,11 @@ var _ = SIGDescribe("FieldValidation", func() {
framework.Failf("cannot create crd %s", err)
}

defer func() {
err = fixtures.DeleteV1CustomResourceDefinition(noxuDefinition, apiExtensionClient)
framework.ExpectNoError(err, "deleting CustomResourceDefinition")
}()

kind := noxuDefinition.Spec.Names.Kind
apiVersion := noxuDefinition.Spec.Group + "/" + noxuDefinition.Spec.Versions[0].Name
name := "mytest"
Expand All @@ -257,8 +262,6 @@ apiVersion: %s
kind: %s
metadata:
name: %s
finalizers:
- test-finalizer
spec:
foo: foo1
cronSpec: "* * * * */5"
Expand Down Expand Up @@ -304,6 +307,11 @@ spec:
framework.Failf("cannot create crd %s", err)
}

defer func() {
err = fixtures.DeleteV1CustomResourceDefinition(noxuDefinition, apiExtensionClient)
framework.ExpectNoError(err, "deleting CustomResourceDefinition")
}()

kind := noxuDefinition.Spec.Names.Kind
apiVersion := noxuDefinition.Spec.Group + "/" + noxuDefinition.Spec.Versions[0].Name
name := "mytest"
Expand All @@ -314,8 +322,6 @@ apiVersion: %s
kind: %s
metadata:
name: %s
finalizers:
- test-finalizer
spec:
unknown: uk1
cronSpec: "* * * * */5"
Expand Down Expand Up @@ -424,6 +430,11 @@ spec:
framework.Failf("cannot create crd %s", err)
}

defer func() {
err = fixtures.DeleteV1CustomResourceDefinition(noxuDefinition, apiExtensionClient)
framework.ExpectNoError(err, "deleting CustomResourceDefinition")
}()

kind := noxuDefinition.Spec.Names.Kind
apiVersion := noxuDefinition.Spec.Group + "/" + noxuDefinition.Spec.Versions[0].Name
name := "mytest"
Expand All @@ -434,8 +445,6 @@ apiVersion: %s
kind: %s
metadata:
name: %s
finalizers:
- test-finalizer
unknownField: unknown
spec:
foo: foo1
Expand Down Expand Up @@ -563,6 +572,11 @@ spec:
framework.Failf("cannot create crd %s", err)
}

defer func() {
err = fixtures.DeleteV1CustomResourceDefinition(noxuDefinition, apiExtensionClient)
framework.ExpectNoError(err, "deleting CustomResourceDefinition")
}()

kind := noxuDefinition.Spec.Names.Kind
apiVersion := noxuDefinition.Spec.Group + "/" + noxuDefinition.Spec.Versions[0].Name
name := "mytest"
Expand All @@ -574,8 +588,6 @@ kind: %s
metadata:
name: %s
unknownMeta: unknown
finalizers:
- test-finalizer
spec:
template:
apiversion: foo/v1
Expand Down Expand Up @@ -690,6 +702,11 @@ spec:
framework.Failf("cannot create crd %s", err)
}

defer func() {
err = fixtures.DeleteV1CustomResourceDefinition(noxuDefinition, apiExtensionClient)
framework.ExpectNoError(err, "deleting CustomResourceDefinition")
}()

kind := noxuDefinition.Spec.Names.Kind
apiVersion := noxuDefinition.Spec.Group + "/" + noxuDefinition.Spec.Versions[0].Name
name := "mytest"
Expand All @@ -700,8 +717,6 @@ apiVersion: %s
kind: %s
metadata:
name: %s
finalizers:
- test-finalizer
spec:
unknown: uk1
foo: foo1
Expand All @@ -718,7 +733,7 @@ spec:
Param("fieldValidation", "Strict").
Body(yamlBody).
DoRaw(ctx)
if !(strings.Contains(string(result), `line 11: key \"foo\" already set in map`)) {
if !(strings.Contains(string(result), `line 9: key \"foo\" already set in map`)) {
framework.Failf("error missing duplicate field: %v:\n%v", err, string(result))
}
})
Expand Down