remove cache reader marshal/unmarshal

Author: Shawn Hurley

pkg/cache/internal/cache_reader.go

@@ -18,13 +18,11 @@ package internal
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"reflect"
 
 	"k8s.io/apimachinery/pkg/api/errors"
 	apimeta "k8s.io/apimachinery/pkg/api/meta"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -75,21 +73,6 @@ func (c *CacheReader) Get(_ context.Context, key client.ObjectKey, out runtime.O
 	// TODO(directxman12): revisit the decision to always deepcopy
 	obj = obj.(runtime.Object).DeepCopyObject()
 
-	// If out is supposed to be unstructured handle correctly.
-	if o, ok := out.(*unstructured.Unstructured); ok {
-		//Encode the obj to a map[string]interface and et the out.Object
-		b, err := json.Marshal(obj)
-		if err != nil {
-			return err
-		}
-		err = json.Unmarshal(b, o)
-		if err != nil {
-			return err
-		}
-		o.SetGroupVersionKind(c.groupVersionKind)
-		return nil
-	}
-
 	// Copy the value of the item in the cache to the returned value
 	// TODO(directxman12): this is a terrible hack, pls fix (we should have deepcopyinto)
 	outVal := reflect.ValueOf(out)

pkg/cache/internal/informers_map.go

@@ -194,32 +194,33 @@ func (ip *InformersMap) Get(gvk schema.GroupVersionKind, obj runtime.Object) (*M
 
 // newListWatch returns a new ListWatch object that can be used to create a SharedIndexInformer.
 func (ip *InformersMap) newListWatch(gvk schema.GroupVersionKind, isUnstructured bool) (*cache.ListWatch, error) {
-	// Construct a RESTClient for the groupVersionKind that we will use to
-	// talk to the apiserver.
-	var client rest.Interface
-	var err error
-	if isUnstructured {
-		client, err = apiutil.RESTUnstructuredClientForGVK(gvk, ip.config)
-	} else {
-		client, err = apiutil.RESTClientForGVK(gvk, ip.config, ip.codecs)
-
-	}
-	if err != nil {
-		return nil, err
-	}
-
 	// Kubernetes APIs work against Resources, not GroupVersionKinds.  Map the
 	// groupVersionKind to the Resource API we will use.
 	mapping, err := ip.mapper.RESTMapping(gvk.GroupKind(), gvk.Version)
 	if err != nil {
 		return nil, err
 	}
 
-	// Get a listObject for listing that the ListWatch can DeepCopy
-	listGVK := gvk.GroupVersion().WithKind(gvk.Kind + "List")
-	listObj, err := ip.Scheme.New(listGVK)
-	if err != nil {
-		return nil, err
+	// Construct a RESTClient for the groupVersionKind that we will use to
+	// talk to the apiserver.
+	var client rest.Interface
+	var listObj runtime.Object
+	if isUnstructured {
+		listObj = &unstructured.UnstructuredList{}
+		client, err = apiutil.RESTUnstructuredClientForGVK(gvk, ip.config)
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		client, err = apiutil.RESTClientForGVK(gvk, ip.config, ip.codecs)
+		if err != nil {
+			return nil, err
+		}
+		listGVK := gvk.GroupVersion().WithKind(gvk.Kind + "List")
+		listObj, err = ip.Scheme.New(listGVK)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	// Create a new ListWatch for the obj