Merge pull request #957 from Random-Liu/cherrypick-#954-release-0.5

k8s-ci-robot · web-flow · commit f31eaf7d8b3e · 2020-05-20T16:10:19.000-07:00
Backport release-0.5: Fix scheme used by `DeleteAllOf` in the fake client.
diff --git a/pkg/client/fake/client.go b/pkg/client/fake/client.go
@@ -238,7 +238,7 @@ func (c *fakeClient) Delete(ctx context.Context, obj runtime.Object, opts ...cli
 }
 
 func (c *fakeClient) DeleteAllOf(ctx context.Context, obj runtime.Object, opts ...client.DeleteAllOfOption) error {
-	gvk, err := apiutil.GVKForObject(obj, scheme.Scheme)
+	gvk, err := apiutil.GVKForObject(obj, c.scheme)
 	if err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ func (c *fakeClient) Delete(ctx context.Context, obj runtime.Object, opts ...cli`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`func (c *fakeClient) DeleteAllOf(ctx context.Context, obj runtime.Object, opts ...client.DeleteAllOfOption) error {`
`241`		`- gvk, err := apiutil.GVKForObject(obj, scheme.Scheme)`
	`241`	`+ gvk, err := apiutil.GVKForObject(obj, c.scheme)`
`242`	`242`	`if err != nil {`
`243`	`243`	`return err`
`244`	`244`	`}`