cleanup client/config

Author: pwittrock

pkg/client/client.go

@@ -20,11 +20,9 @@ import (
 	"context"
 	"fmt"
 	"reflect"
-	"sync"
 
 	"github.com/kubernetes-sigs/controller-runtime/pkg/client/apiutil"
 	"k8s.io/apimachinery/pkg/api/meta"
-	"k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/client-go/kubernetes/scheme"
@@ -60,209 +58,93 @@ func New(config *rest.Config, options Options) (Client, error) {
 		}
 	}
 
-	c := &populatingClient{
-		config:          config,
-		scheme:          options.Scheme,
-		mapper:          options.Mapper,
-		codecs:          serializer.NewCodecFactory(options.Scheme),
-		paramCodec:      runtime.NewParameterCodec(options.Scheme),
-		clientsByType:   make(map[reflect.Type]rest.Interface),
-		resourcesByType: make(map[reflect.Type]string),
-		mappingByType:   make(map[reflect.Type]*meta.RESTMapping),
+	c := &client{
+		cache: clientCache{
+			config:         config,
+			scheme:         options.Scheme,
+			mapper:         options.Mapper,
+			codecs:         serializer.NewCodecFactory(options.Scheme),
+			resourceByType: make(map[reflect.Type]*resourceMeta),
+		},
+		paramCodec: runtime.NewParameterCodec(options.Scheme),
 	}
 
 	return c, nil
 }
 
-var _ Client = &populatingClient{}
+var _ Client = &client{}
 
-// populatingClient is an Client that reads and writes directly from/to an API server.  It lazily initialized
-// new clients when they are used.
-type populatingClient struct {
-	config *rest.Config
-	scheme *runtime.Scheme
-	mapper meta.RESTMapper
-
-	codecs          serializer.CodecFactory
-	paramCodec      runtime.ParameterCodec
-	clientsByType   map[reflect.Type]rest.Interface
-	mappingByType   map[reflect.Type]*meta.RESTMapping
-	resourcesByType map[reflect.Type]string
-	mu              sync.RWMutex
-}
-
-// makeClient maps obj to a Kubernetes Resource and constructs a populatingClient for that Resource.
-func (c *populatingClient) makeClient(obj runtime.Object) (rest.Interface, *meta.RESTMapping, string, error) {
-	gvk, err := apiutil.GVKForObject(obj, c.scheme)
-	if err != nil {
-		return nil, nil, "", err
-	}
-	client, err := apiutil.RESTClientForGVK(gvk, c.config, c.codecs)
-	if err != nil {
-		return nil, nil, "", err
-	}
-	mapping, err := c.mapper.RESTMapping(gvk.GroupKind(), gvk.Version)
-	if err != nil {
-		return nil, nil, "", err
-	}
-	return client, mapping, mapping.Resource, nil
-}
-
-// clientFor returns a raw rest.Client for the given object type.
-func (c *populatingClient) clientFor(obj runtime.Object) (rest.Interface, *meta.RESTMapping, string, error) {
-	typ := reflect.TypeOf(obj)
-
-	// It's better to do creation work twice than to not let multiple
-	// people make requests at once
-	c.mu.RLock()
-	client, known := c.clientsByType[typ]
-	resource, _ := c.resourcesByType[typ]
-	mapping, _ := c.mappingByType[typ]
-	c.mu.RUnlock()
-
-	// Initialize a new Client
-	if !known {
-		var err error
-		client, mapping, resource, err = c.makeClient(obj)
-		if err != nil {
-			return nil, mapping, "", err
-		}
-		c.mu.Lock()
-		defer c.mu.Unlock()
-		c.clientsByType[typ] = client
-		c.resourcesByType[typ] = resource
-		c.mappingByType[typ] = mapping
-	}
-
-	return client, mapping, resource, nil
-}
-
-func (c *populatingClient) metaAndClientFor(obj runtime.Object) (v1.Object, rest.Interface, *meta.RESTMapping, string, error) {
-	client, mapping, resource, err := c.clientFor(obj)
-	if err != nil {
-		return nil, nil, nil, "", err
-	}
-
-	meta, err := meta.Accessor(obj)
-	if err != nil {
-		return nil, nil, nil, "", err
-	}
-	return meta, client, mapping, resource, err
+// client is a client.Client that reads and writes directly from/to an API server.  It lazily initialized
+// new clients at the time they are used, and caches the client.
+type client struct {
+	cache      clientCache
+	paramCodec runtime.ParameterCodec
 }
 
-func isNamespaced(mapping *meta.RESTMapping) bool {
-	if mapping.Scope.Name() == meta.RESTScopeNameRoot {
-		return false
-	}
-	return true
-}
-
-// Create implements Client
-func (c *populatingClient) Create(ctx context.Context, obj runtime.Object) error {
-	meta, client, mapping, resource, err := c.metaAndClientFor(obj)
+// Create implements client.Client
+func (c *client) Create(ctx context.Context, obj runtime.Object) error {
+	o, err := c.cache.getObjMeta(obj)
 	if err != nil {
 		return err
 	}
-
-	if isNamespaced(mapping) {
-		return client.Post().
-			Namespace(meta.GetNamespace()).
-			Resource(resource).
-			Body(obj).
-			Do().
-			Into(obj)
-	}
-
-	return client.Post().
-		Resource(resource).
+	return o.Post().
+		NamespaceIfScoped(o.GetNamespace(), o.isNamespaced()).
+		Resource(o.resource()).
 		Body(obj).
 		Do().
 		Into(obj)
 }
 
-// Update implements Client
-func (c *populatingClient) Update(ctx context.Context, obj runtime.Object) error {
-	meta, client, mapping, resource, err := c.metaAndClientFor(obj)
+// Update implements client.Client
+func (c *client) Update(ctx context.Context, obj runtime.Object) error {
+	o, err := c.cache.getObjMeta(obj)
 	if err != nil {
 		return err
 	}
-	if isNamespaced(mapping) {
-		return client.Put().
-			Namespace(meta.GetNamespace()).
-			Resource(resource).
-			Name(meta.GetName()).
-			Body(obj).
-			Do().
-			Into(obj)
-	}
-
-	return client.Put().
-		Resource(resource).
-		Name(meta.GetName()).
+	return o.Put().
+		NamespaceIfScoped(o.GetNamespace(), o.isNamespaced()).
+		Resource(o.resource()).
+		Name(o.GetName()).
 		Body(obj).
 		Do().
 		Into(obj)
 }
 
-// Delete implements Client
-func (c *populatingClient) Delete(ctx context.Context, obj runtime.Object) error {
-	meta, client, mapping, resource, err := c.metaAndClientFor(obj)
+// Delete implements client.Client
+func (c *client) Delete(ctx context.Context, obj runtime.Object) error {
+	o, err := c.cache.getObjMeta(obj)
 	if err != nil {
 		return err
 	}
-	if isNamespaced(mapping) {
-		return client.Delete().
-			Namespace(meta.GetNamespace()).
-			Resource(resource).
-			Name(meta.GetName()).
-			Do().
-			Error()
-	}
-	return client.Delete().
-		Resource(resource).
-		Name(meta.GetName()).
+	return o.Delete().
+		NamespaceIfScoped(o.GetNamespace(), o.isNamespaced()).
+		Resource(o.resource()).
+		Name(o.GetName()).
 		Do().
 		Error()
 }
 
-// Get implements Client
-func (c *populatingClient) Get(ctx context.Context, key ObjectKey, obj runtime.Object) error {
-	_, client, mapping, resource, err := c.metaAndClientFor(obj)
+// Get implements client.Client
+func (c *client) Get(ctx context.Context, key ObjectKey, obj runtime.Object) error {
+	r, err := c.cache.getResource(obj)
 	if err != nil {
 		return err
 	}
-	if isNamespaced(mapping) {
-		return client.Get().
-			Namespace(key.Namespace).
-			Resource(resource).
-			Name(key.Name).
-			Do().
-			Into(obj)
-	}
-	return client.Get().
-		Resource(resource).
-		Name(key.Name).
-		Do().
-		Into(obj)
+	return r.Get().
+		NamespaceIfScoped(key.Namespace, r.isNamespaced()).
+		Resource(r.resource()).
+		Name(key.Name).Do().Into(obj)
 }
 
-// List implements Client
-func (c *populatingClient) List(ctx context.Context, opts *ListOptions, obj runtime.Object) error {
-	_, client, mapping, resource, err := c.metaAndClientFor(obj)
+// List implements client.Client
+func (c *client) List(ctx context.Context, opts *ListOptions, obj runtime.Object) error {
+	r, err := c.cache.getResource(obj)
 	if err != nil {
 		return err
 	}
-	if isNamespaced(mapping) && opts != nil && len(opts.Namespace) > 0 {
-		return client.Get().
-			Namespace(opts.Namespace).
-			Resource(resource).
-			Body(obj).
-			VersionedParams(opts.AsListOptions(), c.paramCodec).
-			Do().
-			Into(obj)
-	}
-	return client.Get().
-		Resource(resource).
+	return r.Get().
+		NamespaceIfScoped(opts.Namespace, r.isNamespaced()).
+		Resource(r.resource()).
 		Body(obj).
 		VersionedParams(opts.AsListOptions(), c.paramCodec).
 		Do().