github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84235 from liggitt/extensions-v1-coverage

Browse Source 
Use v1 CRD deletion endpoints in e2e tests
This commit is contained in:
Kubernetes Prow Robot 2019-10-23 19:07:19 -07:00 committed by GitHub
commit 31b7e3d905
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/apiextensions-apiserver/test/integration/fixtures/resources.go
View File

@ -523,7 +523,7 @@ func DeleteCustomResourceDefinition(crd *apiextensionsv1beta1.CustomResourceDefi
// DeleteV1CustomResourceDefinition deletes a CRD and waits until it disappears from discovery. // DeleteV1CustomResourceDefinition deletes a CRD and waits until it disappears from discovery.
func DeleteV1CustomResourceDefinition(crd *apiextensionsv1.CustomResourceDefinition, apiExtensionsClient clientset.Interface) error { func DeleteV1CustomResourceDefinition(crd *apiextensionsv1.CustomResourceDefinition, apiExtensionsClient clientset.Interface) error {
if err := apiExtensionsClient.ApiextensionsV1beta1().CustomResourceDefinitions().Delete(crd.Name, nil); err != nil { if err := apiExtensionsClient.ApiextensionsV1().CustomResourceDefinitions().Delete(crd.Name, nil); err != nil {
return err return err
} }
for _, version := range servedV1Versions(crd) { for _, version := range servedV1Versions(crd) {

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

@ -121,7 +121,7 @@ var _ = SIGDescribe("CustomResourceDefinition resources [Privileged:ClusterAdmin
} }
// Use delete collection to remove the CRDs // Use delete collection to remove the CRDs
err = fixtures.DeleteCustomResourceDefinitions(selectorListOpts, apiExtensionClient) err = fixtures.DeleteV1CustomResourceDefinitions(selectorListOpts, apiExtensionClient)
framework.ExpectNoError(err, "deleting CustomResourceDefinitions") framework.ExpectNoError(err, "deleting CustomResourceDefinitions")
_, err = apiExtensionClient.ApiextensionsV1().CustomResourceDefinitions().Get(crd.Name, metav1.GetOptions{}) _, err = apiExtensionClient.ApiextensionsV1().CustomResourceDefinitions().Get(crd.Name, metav1.GetOptions{})
framework.ExpectNoError(err, "getting remaining CustomResourceDefinition") framework.ExpectNoError(err, "getting remaining CustomResourceDefinition")