Merge branch 'master' into panic-not-exit

kubernetes-sigs · Apr 4, 2019 · 205d899 · 205d899
2 parents f6add76 + 90226f9
commit 205d899
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Documentation:
 - [Basic controller using builder](https://godoc.org/github.com/kubernetes-sigs/controller-runtime/pkg/builder#example-Builder)
 - [Creating a manager](https://godoc.org/github.com/kubernetes-sigs/controller-runtime/pkg/manager#example-New)
 - [Creating a controller](https://godoc.org/github.com/kubernetes-sigs/controller-runtime/pkg/controller#example-New)
-- [Example `main.go`](https://github.com/kubernetes-sigs/controller-runtime/blob/master/example/main.go)
+- [Examples](https://github.com/kubernetes-sigs/controller-runtime/blob/master/examples)
 
 # Versioning, Maintenance, and Compatibility
 

diff --git a/pkg/client/fake/client.go b/pkg/client/fake/client.go
@@ -85,7 +85,7 @@ func (c *fakeClient) Get(ctx context.Context, key client.ObjectKey, obj runtime.
 }
 
 func (c *fakeClient) List(ctx context.Context, obj runtime.Object, opts ...client.ListOptionFunc) error {
-	gvk, err := apiutil.GVKForObject(obj, scheme.Scheme)
+	gvk, err := apiutil.GVKForObject(obj, c.scheme)
 	if err != nil {
 		return err
 	}