Merge pull request #1109 from vincepri/expose-client-restmapperx

⚠️ Expose RESTMapper on Client interface

Author: k8s-ci-robot

pkg/client/client.go

@@ -86,6 +86,7 @@ func New(config *rest.Config, options Options) (Client, error) {
 			paramCodec: noConversionParamCodec{},
 		},
 		scheme: options.Scheme,
+		mapper: options.Mapper,
 	}
 
 	return c, nil
@@ -99,6 +100,7 @@ type client struct {
 	typedClient        typedClient
 	unstructuredClient unstructuredClient
 	scheme             *runtime.Scheme
+	mapper             meta.RESTMapper
 }
 
 // resetGroupVersionKind is a helper function to restore and preserve GroupVersionKind on an object.
@@ -116,6 +118,11 @@ func (c *client) Scheme() *runtime.Scheme {
 	return c.scheme
 }
 
+// RESTMapper returns the scheme this client is using.
+func (c *client) RESTMapper() meta.RESTMapper {
+	return c.mapper
+}
+
 // Create implements client.Client
 func (c *client) Create(ctx context.Context, obj runtime.Object, opts ...CreateOption) error {
 	_, ok := obj.(*unstructured.Unstructured)

pkg/client/dryrun.go

@@ -19,6 +19,7 @@ package client
 import (
 	"context"
 
+	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
@@ -40,6 +41,11 @@ func (c *dryRunClient) Scheme() *runtime.Scheme {
 	return c.client.Scheme()
 }
 
+// RESTMapper returns the rest mapper this client is using.
+func (c *dryRunClient) RESTMapper() meta.RESTMapper {
+	return c.client.RESTMapper()
+}
+
 // Create implements client.Client
 func (c *dryRunClient) Create(ctx context.Context, obj runtime.Object, opts ...CreateOption) error {
 	return c.client.Create(ctx, obj, append(opts, DryRunAll)...)

pkg/client/fake/client.go

@@ -228,6 +228,11 @@ func (c *fakeClient) Scheme() *runtime.Scheme {
 	return c.scheme
 }
 
+func (c *fakeClient) RESTMapper() meta.RESTMapper {
+	// TODO: Implement a fake RESTMapper.
+	return nil
+}
+
 func (c *fakeClient) Create(ctx context.Context, obj runtime.Object, opts ...client.CreateOption) error {
 	createOptions := &client.CreateOptions{}
 	createOptions.ApplyOptions(opts)

pkg/client/interfaces.go

@@ -108,6 +108,8 @@ type Client interface {
 
 	// Scheme returns the scheme this client is using.
 	Scheme() *runtime.Scheme
+	// RESTMapper returns the rest this client is using.
+	RESTMapper() meta.RESTMapper
 }
 
 // IndexerFunc knows how to take an object and turn it into a series

pkg/client/split.go

@@ -19,13 +19,13 @@ package client
 import (
 	"context"
 
+	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
 // NewDelegatingClientInput encapsulates the input parameters to create a new delegating client.
 type NewDelegatingClientInput struct {
-	Scheme      *runtime.Scheme
 	CacheReader Reader
 	Client      Client
 }
@@ -37,7 +37,8 @@ type NewDelegatingClientInput struct {
 // cache and writes to the API server.
 func NewDelegatingClient(in NewDelegatingClientInput) Client {
 	return &delegatingClient{
-		scheme: in.Scheme,
+		scheme: in.Client.Scheme(),
+		mapper: in.Client.RESTMapper(),
 		Reader: &delegatingReader{
 			CacheReader:  in.CacheReader,
 			ClientReader: in.Client,
@@ -53,13 +54,19 @@ type delegatingClient struct {
 	StatusClient
 
 	scheme *runtime.Scheme
+	mapper meta.RESTMapper
 }
 
 // Scheme returns the scheme this client is using.
 func (d *delegatingClient) Scheme() *runtime.Scheme {
 	return d.scheme
 }
 
+// RESTMapper returns the rest mapper this client is using.
+func (d *delegatingClient) RESTMapper() meta.RESTMapper {
+	return d.mapper
+}
+
 // delegatingReader forms a Reader that will cause Get and List requests for
 // unstructured types to use the ClientReader while requests for any other type
 // of object with use the CacheReader.  This avoids accidentally caching the

pkg/runtime/inject/inject_test.go

@@ -27,6 +27,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/cache/informertest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 )
 
 var instance *testSource
@@ -86,7 +87,7 @@ var _ = Describe("runtime inject", func() {
 	})
 
 	It("should set client", func() {
-		client := client.NewDelegatingClient(client.NewDelegatingClientInput{})
+		client := client.NewDelegatingClient(client.NewDelegatingClientInput{Client: fake.NewFakeClient()})
 
 		By("Validating injecting client")
 		res, err := ClientInto(client, instance)
@@ -151,7 +152,7 @@ var _ = Describe("runtime inject", func() {
 	})
 
 	It("should set api reader", func() {
-		apiReader := client.NewDelegatingClient(client.NewDelegatingClientInput{})
+		apiReader := client.NewDelegatingClient(client.NewDelegatingClientInput{Client: fake.NewFakeClient()})
 
 		By("Validating injecting client")
 		res, err := APIReaderInto(apiReader, instance)