fix rebase issues

Author: pwittrock

pkg/cache/cache.go

@@ -35,9 +35,9 @@ import (
 
 var log = logf.KBLog.WithName("object-cache")
 
-// Cache implements ReadInterface by reading objects from a cache populated by InformersMap
+// Cache implements Reader by reading objects from a cache populated by InformersMap
 type Cache interface {
-	// Cache implements the client ReadInterface
+	// Cache implements the client Reader
 	client.Reader
 
 	// Cache implements InformersMap
@@ -91,7 +91,7 @@ type informerCache struct {
 	*internal.InformersMap
 }
 
-func Default(config *rest.Config, opts Options) (Options, error) {
+func defaultOpts(config *rest.Config, opts Options) (Options, error) {
 	// Use the default Kubernetes Scheme if unset
 	if opts.Scheme == nil {
 		opts.Scheme = scheme.Scheme
@@ -117,7 +117,7 @@ func Default(config *rest.Config, opts Options) (Options, error) {
 
 // New initializes and returns a new Cache
 func New(config *rest.Config, opts Options) (Cache, error) {
-	opts, err := Default(config, opts)
+	opts, err := defaultOpts(config, opts)
 	if err != nil {
 		return nil, err
 	}

pkg/cache/cache_test.go

@@ -90,7 +90,7 @@ var _ = Describe("Indexers", func() {
 	//})
 	//
 	//Describe("populatingClient interface wrapper around an indexer", func() {
-	//	var singleCache client.ReadInterface
+	//	var singleCache client.Reader
 	//
 	//	BeforeEach(func() {
 	//		var err error

pkg/cache/internal/typed_reader.go

@@ -33,7 +33,7 @@ import (
 )
 
 // Reader is a Reader
-var _ client.ReadInterface = &Reader{}
+var _ client.Reader = &Reader{}
 
 // Reader wraps a cache.Index to implement the client.Reader interface for a single type
 type Reader struct {

pkg/cache/reader.go

@@ -27,9 +27,9 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
-var _ client.ReadInterface = &informerCache{}
+var _ client.Reader = &informerCache{}
 
-// Get implements ReadInterface
+// Get implements Reader
 func (ip *informerCache) Get(ctx context.Context, key client.ObjectKey, out runtime.Object) error {
 	gvk, err := apiutil.GVKForObject(out, ip.Scheme)
 	if err != nil {
@@ -43,7 +43,7 @@ func (ip *informerCache) Get(ctx context.Context, key client.ObjectKey, out runt
 	return cache.Reader.Get(ctx, key, out)
 }
 
-// List implements ReadInterface
+// List implements Reader
 func (ip *informerCache) List(ctx context.Context, opts *client.ListOptions, out runtime.Object) error {
 	itemsPtr, err := apimeta.GetItemsPtr(out)
 	if err != nil {