github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

client-go dynamic client: update DeleteOptions callers

Browse Source
This commit is contained in:
Jordan Liggitt 2020-03-06 10:20:40 -05:00
parent 161b7513f7
commit b19dc3a474
23 changed files with 50 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
staging/src/k8s.io/apiextensions-apiserver/test/integration/basic_test.go
View File

@ -265,7 +265,7 @@ func testSimpleCRUD(t *testing.T, ns string, noxuDefinition *apiextensionsv1beta
}
// Delete test
if err := noxuResourceClient.Delete("foo", metav1.NewDeleteOptions(0)); err != nil {
if err := noxuResourceClient.Delete("foo", *metav1.NewDeleteOptions(0)); err != nil {
t.Fatal(err)
}
@ -305,7 +305,7 @@ func testSimpleCRUD(t *testing.T, ns string, noxuDefinition *apiextensionsv1beta
}
// Delete test
if err := noxuResourceClient.DeleteCollection(metav1.NewDeleteOptions(0), metav1.ListOptions{}); err != nil {
if err := noxuResourceClient.DeleteCollection(*metav1.NewDeleteOptions(0), metav1.ListOptions{}); err != nil {
t.Fatal(err)
}
}
@ -468,10 +468,10 @@ func testFieldSelector(t *testing.T, ns string, noxuDefinition *apiextensionsv1b
t.Errorf("expected %v, got %v", e, a)
}
if err := noxuResourceClient.Delete("bar", nil); err != nil {
if err := noxuResourceClient.Delete("bar", metav1.DeleteOptions{}); err != nil {
t.Fatal(err)
}
if err := noxuResourceClient.Delete("foo", nil); err != nil {
if err := noxuResourceClient.Delete("foo", metav1.DeleteOptions{}); err != nil {
t.Fatal(err)
}

6
staging/src/k8s.io/apiextensions-apiserver/test/integration/finalization_test.go
View File

@ -50,7 +50,7 @@ func TestFinalization(t *testing.T) {
require.NoError(t, err)
uid := createdNoxuInstance.GetUID()
err = noxuResourceClient.Delete(name, &metav1.DeleteOptions{
err = noxuResourceClient.Delete(name, metav1.DeleteOptions{
Preconditions: &metav1.Preconditions{
UID: &uid,
},
@ -65,7 +65,7 @@ func TestFinalization(t *testing.T) {
require.NotNil(t, gottenNoxuInstance.GetDeletionTimestamp())
// Trying to delete it again to confirm it will not remove the object because finalizer is still there.
err = noxuResourceClient.Delete(name, &metav1.DeleteOptions{
err = noxuResourceClient.Delete(name, metav1.DeleteOptions{
Preconditions: &metav1.Preconditions{
UID: &uid,
},
@ -116,7 +116,7 @@ func TestFinalizationAndDeletion(t *testing.T) {
// Delete a CR. Because there's a finalizer, it will not get deleted now.
uid := createdNoxuInstance.GetUID()
err = noxuResourceClient.Delete(name, &metav1.DeleteOptions{
err = noxuResourceClient.Delete(name, metav1.DeleteOptions{
Preconditions: &metav1.Preconditions{
UID: &uid,
},

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

@ -466,7 +466,7 @@ func isWatchCachePrimed(crd *apiextensionsv1.CustomResourceDefinition, dynamicCl
if err != nil {
return false, err
}
err = resourceClient.Delete(createdInstance.GetName(), nil)
err = resourceClient.Delete(createdInstance.GetName(), metav1.DeleteOptions{})
if err != nil {
return false, err
}

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

@ -181,7 +181,7 @@ func TestInvalidObjectMetaInStorage(t *testing.T) {
t.Logf("Checking that invalid objects can be deleted")
noxuResourceClient := newNamespacedCustomResourceClient("default", dynamicClient, noxuDefinition)
if err := noxuResourceClient.Delete("foo", &metav1.DeleteOptions{}); err != nil {
if err := noxuResourceClient.Delete("foo", metav1.DeleteOptions{}); err != nil {
t.Fatalf("Unexpected delete error %v", err)
}
if _, err := etcdclient.Put(ctx, key, string(val)); err != nil {

4
staging/src/k8s.io/apiextensions-apiserver/test/integration/registration_test.go
View File

@ -128,7 +128,7 @@ func TestMultipleResourceInstances(t *testing.T) {
}
}
for key := range instances {
if err := noxuNamespacedResourceClient.Delete(key, nil); err != nil {
if err := noxuNamespacedResourceClient.Delete(key, metav1.DeleteOptions{}); err != nil {
t.Fatalf("unable to delete %s:%v", key, err)
}
}
@ -292,7 +292,7 @@ func TestDeRegistrationAndReRegistration(t *testing.T) {
t.Fatalf("expected %v, got %v", e, a)
}
if err := noxuNamespacedResourceClient.Delete(sameInstanceName, nil); err != nil {
if err := noxuNamespacedResourceClient.Delete(sameInstanceName, metav1.DeleteOptions{}); err != nil {
t.Fatal(err)
}
if _, err = noxuNamespacedResourceClient.Get(sameInstanceName, metav1.GetOptions{}); err == nil || !errors.IsNotFound(err) {

8
staging/src/k8s.io/apiextensions-apiserver/test/integration/scope_test.go
View File

@ -128,16 +128,16 @@ func TestHandlerScope(t *testing.T) {
_, err = otherScopeClient.Patch(name, types.MergePatchType, []byte(`{"metadata":{"annotations":{"test":"1"}}}`), metav1.PatchOptions{}, "scale")
assert.True(t, apierrors.IsNotFound(err))
err = otherScopeClient.Delete(name, &metav1.DeleteOptions{})
err = otherScopeClient.Delete(name, metav1.DeleteOptions{})
assert.True(t, apierrors.IsNotFound(err))
err = otherScopeClient.Delete(name, &metav1.DeleteOptions{}, "status")
err = otherScopeClient.Delete(name, metav1.DeleteOptions{}, "status")
assert.True(t, apierrors.IsNotFound(err))
err = otherScopeClient.Delete(name, &metav1.DeleteOptions{}, "scale")
err = otherScopeClient.Delete(name, metav1.DeleteOptions{}, "scale")
assert.True(t, apierrors.IsNotFound(err))
err = otherScopeClient.DeleteCollection(&metav1.DeleteOptions{}, metav1.ListOptions{})
err = otherScopeClient.DeleteCollection(metav1.DeleteOptions{}, metav1.ListOptions{})
assert.True(t, apierrors.IsNotFound(err))
if scope == apiextensionsv1beta1.ClusterScoped {

10
staging/src/k8s.io/apiextensions-apiserver/test/integration/subresources_test.go
View File

@ -249,7 +249,7 @@ func TestStatusSubresource(t *testing.T) {
if statusNum != int64(20) {
t.Fatalf(".status.num: expected: %v, got: %v", int64(20), statusNum)
}
noxuResourceClient.Delete("foo", &metav1.DeleteOptions{})
noxuResourceClient.Delete("foo", mmetav1.DeleteOptions{})
}
if err := fixtures.DeleteCustomResourceDefinition(noxuDefinition, apiExtensionClient); err != nil {
t.Fatal(err)
@ -394,7 +394,7 @@ func TestScaleSubresource(t *testing.T) {
if err == nil {
t.Fatalf("unexpected non-error: .spec.replicas should be less than 2147483647")
}
noxuResourceClient.Delete("foo", &metav1.DeleteOptions{})
noxuResourceClient.Delete("foo", mmetav1.DeleteOptions{})
if err := fixtures.DeleteCustomResourceDefinition(noxuDefinition, apiExtensionClient); err != nil {
t.Fatal(err)
}
@ -547,7 +547,7 @@ func TestValidateOnlyStatus(t *testing.T) {
if !strings.Contains(statusError.Error(), "Invalid value") {
t.Fatalf("expected 'Invalid value' in error, got: %v", err)
}
noxuResourceClient.Delete("foo", &metav1.DeleteOptions{})
noxuResourceClient.Delete("foo", mmetav1.DeleteOptions{})
}
if err := fixtures.DeleteCustomResourceDefinition(noxuDefinition, apiExtensionClient); err != nil {
t.Fatal(err)
@ -711,7 +711,7 @@ func TestGeneration(t *testing.T) {
if updatedInstance.GetGeneration() != 2 {
t.Fatalf("updating spec should increment .metadata.generation: expected: %v, got: %v", 2, updatedStatusInstance.GetGeneration())
}
noxuResourceClient.Delete("foo", &metav1.DeleteOptions{})
noxuResourceClient.Delete("foo", metav1.DeleteOptions{})
}
if err := fixtures.DeleteCustomResourceDefinition(noxuDefinition, apiExtensionClient); err != nil {
t.Fatal(err)
@ -885,7 +885,7 @@ func TestSubresourcePatch(t *testing.T) {
if err == nil {
t.Fatalf("unexpected non-error: strategic merge patch is not supported for custom resources")
}
noxuResourceClient.Delete("foo", &metav1.DeleteOptions{})
noxuResourceClient.Delete("foo", mmetav1.DeleteOptions{})
}
if err := fixtures.DeleteCustomResourceDefinition(noxuDefinition, apiExtensionClient); err != nil {
t.Fatal(err)

6
staging/src/k8s.io/apiextensions-apiserver/test/integration/validation_test.go
View File

@ -246,7 +246,7 @@ func TestCustomResourceValidation(t *testing.T) {
if err != nil {
t.Fatalf("unable to create noxu instance: %v", err)
}
noxuResourceClient.Delete("foo", &metav1.DeleteOptions{})
noxuResourceClient.Delete("foo", metav1.DeleteOptions{})
}
if err := fixtures.DeleteCustomResourceDefinition(noxuDefinition, apiExtensionClient); err != nil {
t.Fatal(err)
@ -473,7 +473,7 @@ func TestCustomResourceUpdateValidation(t *testing.T) {
if err == nil {
t.Fatalf("unexpected non-error: alpha and beta should be present while updating %v", gottenNoxuInstance)
}
noxuResourceClient.Delete("foo", &metav1.DeleteOptions{})
noxuResourceClient.Delete("foo", metav1.DeleteOptions{})
}
if err := fixtures.DeleteCustomResourceDefinition(noxuDefinition, apiExtensionClient); err != nil {
t.Fatal(err)
@ -648,7 +648,7 @@ func TestCRValidationOnCRDUpdate(t *testing.T) {
if err != nil {
t.Fatal(err)
}
noxuResourceClient.Delete("foo", &metav1.DeleteOptions{})
noxuResourceClient.Delete("foo", metav1.DeleteOptions{})
if err := fixtures.DeleteCustomResourceDefinition(noxuDefinition, apiExtensionClient); err != nil {
t.Fatal(err)
}

2
staging/src/k8s.io/client-go/examples/dynamic-create-update-delete-deployment/main.go
View File

@ -185,7 +185,7 @@ func main() {
prompt()
fmt.Println("Deleting deployment...")
deletePolicy := metav1.DeletePropagationForeground
deleteOptions := &metav1.DeleteOptions{
deleteOptions := metav1.DeleteOptions{
PropagationPolicy: &deletePolicy,
}
if err := client.Resource(deploymentRes).Namespace(namespace).Delete("demo-deployment", deleteOptions); err != nil {

4
staging/src/k8s.io/kubectl/pkg/cmd/apply/prune.go
View File

@ -145,9 +145,9 @@ func (p *pruner) delete(namespace, name string, mapping *meta.RESTMapping) error
}
func runDelete(namespace, name string, mapping *meta.RESTMapping, c dynamic.Interface, cascade bool, gracePeriod int, serverDryRun bool) error {
options := &metav1.DeleteOptions{}
options := metav1.DeleteOptions{}
if gracePeriod >= 0 {
options = metav1.NewDeleteOptions(int64(gracePeriod))
options = *metav1.NewDeleteOptions(int64(gracePeriod))
}
if serverDryRun {
options.DryRun = []string{metav1.DryRunAll}

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

@ -489,7 +489,7 @@ func TestSampleAPIServer(f *framework.Framework, aggrclient *aggregatorclient.Cl
}
// kubectl delete flunder test-flunder
err = dynamicClient.Delete(flunderName, &metav1.DeleteOptions{})
err = dynamicClient.Delete(flunderName, metav1.DeleteOptions{})
validateErrorWithDebugInfo(f, err, pods, "deleting flunders(%v) using dynamic client", unstructuredList.Items)
// kubectl get flunders

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

@ -512,7 +512,7 @@ func waitWebhookConversionReady(f *framework.Framework, crd *apiextensionsv1.Cus
return false, nil
}
framework.ExpectNoError(customResourceClients[version].Delete(crInstance.GetName(), nil), "cleaning up stub object")
framework.ExpectNoError(customResourceClients[version].Delete(crInstance.GetName(), metav1.DeleteOptions{}), "cleaning up stub object")
return true, nil
}))
}

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

@ -175,7 +175,7 @@ func patchCustomResource(client dynamic.ResourceInterface, name string) error {
}
func deleteCustomResource(client dynamic.ResourceInterface, name string) error {
return client.Delete(name, &metav1.DeleteOptions{})
return client.Delete(name, metav1.DeleteOptions{})
}
func newNamespacedCustomResourceClient(ns string, client dynamic.Interface, crd *apiextensionsv1.CustomResourceDefinition) (dynamic.ResourceInterface, error) {

7
test/e2e/apimachinery/garbage_collector.go
View File

@ -968,7 +968,7 @@ var _ = SIGDescribe("Garbage collector", func() {
// Delete the owner.
background := metav1.DeletePropagationBackground
err = resourceClient.Delete(ownerName, &metav1.DeleteOptions{PropagationPolicy: &background})
err = resourceClient.Delete(ownerName, metav1.DeleteOptions{PropagationPolicy: &background})
if err != nil {
framework.Failf("failed to delete owner resource %q: %v", ownerName, err)
}
@ -988,7 +988,7 @@ var _ = SIGDescribe("Garbage collector", func() {
}
framework.Logf("created canary resource %q", canaryName)
foreground := metav1.DeletePropagationForeground
err = resourceClient.Delete(canaryName, &metav1.DeleteOptions{PropagationPolicy: &foreground})
err = resourceClient.Delete(canaryName, metav1.DeleteOptions{PropagationPolicy: &foreground})
if err != nil {
framework.Failf("failed to delete canary resource %q: %v", canaryName, err)
}
@ -1102,8 +1102,7 @@ var _ = SIGDescribe("Garbage collector", func() {
framework.Logf("created dependent resource %q", dependentName)
// Delete the owner and orphan the dependent.
delOpts := getOrphanOptions()
err = resourceClient.Delete(ownerName, &delOpts)
err = resourceClient.Delete(ownerName, getOrphanOptions())
if err != nil {
framework.Failf("failed to delete owner resource %q: %v", ownerName, err)
}

4
test/e2e/apimachinery/webhook.go
View File

@ -1890,7 +1890,7 @@ func testBlockingCustomResourceUpdateDeletion(f *framework.Framework, crd *apiex
}
ginkgo.By("Deleting the custom resource should be denied")
err = customResourceClient.Delete(crInstanceName, &metav1.DeleteOptions{})
err = customResourceClient.Delete(crInstanceName, metav1.DeleteOptions{})
framework.ExpectError(err, "deleting custom resource %s in namespace: %s should be denied", crInstanceName, f.Namespace.Name)
expectedErrMsg1 := "the custom resource cannot be deleted because it contains unwanted key and value"
if !strings.Contains(err.Error(), expectedErrMsg1) {
@ -1909,7 +1909,7 @@ func testBlockingCustomResourceUpdateDeletion(f *framework.Framework, crd *apiex
framework.ExpectNoError(err, "failed to update custom resource %s in namespace: %s", crInstanceName, f.Namespace.Name)
ginkgo.By("Deleting the updated custom resource should be successful")
err = customResourceClient.Delete(crInstanceName, &metav1.DeleteOptions{})
err = customResourceClient.Delete(crInstanceName, metav1.DeleteOptions{})
framework.ExpectNoError(err, "failed to delete custom resource %s in namespace: %s", crInstanceName, f.Namespace.Name)
}

2
test/e2e/kubectl/kubectl.go
View File

@ -2238,7 +2238,7 @@ func verbsContain(verbs metav1.Verbs, str string) bool {
// deleteObj deletes an Object with the provided client and name.
func deleteObj(client dynamic.ResourceInterface, name string) {
err := client.Delete(name, &metav1.DeleteOptions{})
err := client.Delete(name, metav1.DeleteOptions{})
framework.ExpectNoError(err)
}

4
test/e2e/storage/testsuites/provisioning.go
View File

@ -764,7 +764,7 @@ func prepareSnapshotDataSourceForProvisioning(
cleanupFunc := func() {
framework.Logf("deleting snapshot %q/%q", snapshot.GetNamespace(), snapshot.GetName())
err = dynamicClient.Resource(SnapshotGVR).Namespace(updatedClaim.Namespace).Delete(snapshot.GetName(), nil)
err = dynamicClient.Resource(SnapshotGVR).Namespace(updatedClaim.Namespace).Delete(snapshot.GetName(), metav1.DeleteOptions{})
if err != nil && !apierrors.IsNotFound(err) {
framework.Failf("Error deleting snapshot %q. Error: %v", snapshot.GetName(), err)
}
@ -776,7 +776,7 @@ func prepareSnapshotDataSourceForProvisioning(
}
framework.Logf("deleting SnapshotClass %s", snapshotClass.GetName())
framework.ExpectNoError(dynamicClient.Resource(SnapshotClassGVR).Delete(snapshotClass.GetName(), nil))
framework.ExpectNoError(dynamicClient.Resource(SnapshotClassGVR).Delete(snapshotClass.GetName(), metav1.DeleteOptions{}))
}
return dataSourceRef, cleanupFunc

4
test/e2e/storage/testsuites/snapshottable.go
View File

@ -174,7 +174,7 @@ func (s *snapshottableTestSuite) DefineTests(driver TestDriver, pattern testpatt
framework.ExpectNoError(err)
defer func() {
framework.Logf("deleting SnapshotClass %s", vsc.GetName())
framework.ExpectNoError(dc.Resource(SnapshotClassGVR).Delete(vsc.GetName(), nil))
framework.ExpectNoError(dc.Resource(SnapshotClassGVR).Delete(vsc.GetName(), metav1.DeleteOptions{}))
}()
ginkgo.By("creating a snapshot")
@ -185,7 +185,7 @@ func (s *snapshottableTestSuite) DefineTests(driver TestDriver, pattern testpatt
defer func() {
framework.Logf("deleting snapshot %q/%q", snapshot.GetNamespace(), snapshot.GetName())
// typically this snapshot has already been deleted
err = dc.Resource(SnapshotGVR).Namespace(snapshot.GetNamespace()).Delete(snapshot.GetName(), nil)
err = dc.Resource(SnapshotGVR).Namespace(snapshot.GetNamespace()).Delete(snapshot.GetName(), metav1.DeleteOptions{})
if err != nil && !apierrors.IsNotFound(err) {
framework.Failf("Error deleting snapshot %q. Error: %v", pvc.Name, err)
}

8
test/integration/apiserver/admissionwebhook/admission_test.go
View File

@ -669,7 +669,7 @@ func testResourceDelete(c *testContext) {
background := metav1.DeletePropagationBackground
zero := int64(0)
c.admissionHolder.expect(c.gvr, gvk(c.resource.Group, c.resource.Version, c.resource.Kind), gvkDeleteOptions, v1beta1.Delete, obj.GetName(), obj.GetNamespace(), false, true, true)
err = c.client.Resource(c.gvr).Namespace(obj.GetNamespace()).Delete(obj.GetName(), &metav1.DeleteOptions{GracePeriodSeconds: &zero, PropagationPolicy: &background})
err = c.client.Resource(c.gvr).Namespace(obj.GetNamespace()).Delete(obj.GetName(), metav1.DeleteOptions{GracePeriodSeconds: &zero, PropagationPolicy: &background})
if err != nil {
c.t.Error(err)
return
@ -713,7 +713,7 @@ func testResourceDelete(c *testContext) {
return
}
c.admissionHolder.expect(c.gvr, gvk(c.resource.Group, c.resource.Version, c.resource.Kind), gvkDeleteOptions, v1beta1.Delete, obj.GetName(), obj.GetNamespace(), false, true, true)
err = c.client.Resource(c.gvr).Namespace(obj.GetNamespace()).Delete(obj.GetName(), &metav1.DeleteOptions{GracePeriodSeconds: &zero, PropagationPolicy: &background})
err = c.client.Resource(c.gvr).Namespace(obj.GetNamespace()).Delete(obj.GetName(), metav1.DeleteOptions{GracePeriodSeconds: &zero, PropagationPolicy: &background})
if err != nil {
c.t.Error(err)
return
@ -793,7 +793,7 @@ func testResourceDeletecollection(c *testContext) {
c.admissionHolder.expect(c.gvr, gvk(c.resource.Group, c.resource.Version, c.resource.Kind), gvkDeleteOptions, v1beta1.Delete, "", obj.GetNamespace(), false, true, true)
// delete
err = c.client.Resource(c.gvr).Namespace(obj.GetNamespace()).DeleteCollection(&metav1.DeleteOptions{GracePeriodSeconds: &zero, PropagationPolicy: &background}, metav1.ListOptions{LabelSelector: "webhooktest=true"})
err = c.client.Resource(c.gvr).Namespace(obj.GetNamespace()).DeleteCollection(metav1.DeleteOptions{GracePeriodSeconds: &zero, PropagationPolicy: &background}, metav1.ListOptions{LabelSelector: "webhooktest=true"})
if err != nil {
c.t.Error(err)
return
@ -919,7 +919,7 @@ func testNamespaceDelete(c *testContext) {
zero := int64(0)
c.admissionHolder.expect(c.gvr, gvk(c.resource.Group, c.resource.Version, c.resource.Kind), gvkDeleteOptions, v1beta1.Delete, obj.GetName(), obj.GetNamespace(), false, true, true)
err = c.client.Resource(c.gvr).Namespace(obj.GetNamespace()).Delete(obj.GetName(), &metav1.DeleteOptions{GracePeriodSeconds: &zero, PropagationPolicy: &background})
err = c.client.Resource(c.gvr).Namespace(obj.GetNamespace()).Delete(obj.GetName(), metav1.DeleteOptions{GracePeriodSeconds: &zero, PropagationPolicy: &background})
if err != nil {
c.t.Error(err)
return

2
test/integration/client/dynamic_client_test.go
View File

@ -105,7 +105,7 @@ func TestDynamicClient(t *testing.T) {
}
// delete the pod dynamically
err = dynamicClient.Resource(resource).Namespace("default").Delete(actual.Name, nil)
err = dynamicClient.Resource(resource).Namespace("default").Delete(actual.Name, metav1.DeleteOptions{})
if err != nil {
t.Fatalf("unexpected error when deleting pod: %v", err)
}

6
test/integration/dryrun/dryrun_test.go
View File

@ -178,7 +178,7 @@ func DryRunUpdateTest(t *testing.T, rsc dynamic.ResourceInterface, name string)
}
func DryRunDeleteCollectionTest(t *testing.T, rsc dynamic.ResourceInterface, name string) {
err := rsc.DeleteCollection(&metav1.DeleteOptions{DryRun: []string{metav1.DryRunAll}}, metav1.ListOptions{})
err := rsc.DeleteCollection(metav1.DeleteOptions{DryRun: []string{metav1.DryRunAll}}, metav1.ListOptions{})
if err != nil {
t.Fatalf("dry-run delete collection failed: %v", err)
}
@ -193,7 +193,7 @@ func DryRunDeleteCollectionTest(t *testing.T, rsc dynamic.ResourceInterface, nam
}
func DryRunDeleteTest(t *testing.T, rsc dynamic.ResourceInterface, name string) {
err := rsc.Delete(name, &metav1.DeleteOptions{DryRun: []string{metav1.DryRunAll}})
err := rsc.Delete(name, metav1.DeleteOptions{DryRun: []string{metav1.DryRunAll}})
if err != nil {
t.Fatalf("dry-run delete failed: %v", err)
}
@ -294,7 +294,7 @@ func TestDryRun(t *testing.T) {
}
DryRunDeleteTest(t, rsc, name)
if err = rsc.Delete(obj.GetName(), metav1.NewDeleteOptions(0)); err != nil {
if err = rsc.Delete(obj.GetName(), *metav1.NewDeleteOptions(0)); err != nil {
t.Fatalf("deleting final object failed: %v", err)
}
})

2
test/integration/etcd/etcd_storage_path_test.go
View File

@ -291,7 +291,7 @@ func (c *allClient) cleanup(all *[]cleanupData) error {
obj := (*all)[i].obj
gvr := (*all)[i].resource
if err := c.dynamicClient.Resource(gvr).Namespace(obj.GetNamespace()).Delete(obj.GetName(), nil); err != nil {
if err := c.dynamicClient.Resource(gvr).Namespace(obj.GetNamespace()).Delete(obj.GetName(), metav1.DeleteOptions{}); err != nil {
return err
}
}

4
test/integration/garbagecollector/garbage_collector_test.go
View File

@ -940,7 +940,7 @@ func TestCustomResourceCascadingDeletion(t *testing.T) {
// Delete the owner.
foreground := metav1.DeletePropagationForeground
err = resourceClient.Delete(owner.GetName(), &metav1.DeleteOptions{PropagationPolicy: &foreground})
err = resourceClient.Delete(owner.GetName(), metav1.DeleteOptions{PropagationPolicy: &foreground})
if err != nil {
t.Fatalf("failed to delete owner resource %q: %v", owner.GetName(), err)
}
@ -1018,7 +1018,7 @@ func TestMixedRelationships(t *testing.T) {
// Delete the custom owner.
foreground := metav1.DeletePropagationForeground
err = resourceClient.Delete(customOwner.GetName(), &metav1.DeleteOptions{PropagationPolicy: &foreground})
err = resourceClient.Delete(customOwner.GetName(), metav1.DeleteOptions{PropagationPolicy: &foreground})
if err != nil {
t.Fatalf("failed to delete owner resource %q: %v", customOwner.GetName(), err)
}