Remove inject.Client

Signed-off-by: Vince Prignano <vincepri@redhat.com>

Author: vincepri

pkg/cluster/cluster_test.go

@@ -143,13 +143,6 @@ var _ = Describe("cluster.Cluster", func() {
 			By("Returning an error if dependency injection fails")
 
 			expected := fmt.Errorf("expected error")
-			err = c.SetFields(&injectable{
-				client: func(client client.Client) error {
-					return expected
-				},
-			})
-			Expect(err).To(Equal(expected))
-
 			err = c.SetFields(&injectable{
 				scheme: func(scheme *runtime.Scheme) error {
 					return expected
@@ -219,7 +212,6 @@ var _ = Describe("cluster.Cluster", func() {
 	})
 })
 
-var _ inject.Client = &injectable{}
 var _ inject.Scheme = &injectable{}
 var _ inject.Logger = &injectable{}
 

pkg/cluster/internal.go

@@ -65,9 +65,6 @@ type cluster struct {
 }
 
 func (c *cluster) SetFields(i interface{}) error {
-	if _, err := inject.ClientInto(c.client, i); err != nil {
-		return err
-	}
 	if _, err := inject.SchemeInto(c.scheme, i); err != nil {
 		return err
 	}

pkg/controller/controller_test.go

@@ -35,7 +35,6 @@ import (
 	internalcontroller "sigs.k8s.io/controller-runtime/pkg/internal/controller"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	"sigs.k8s.io/controller-runtime/pkg/runtime/inject"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 )
 
@@ -226,14 +225,13 @@ var _ = Describe("controller.Controller", func() {
 })
 
 var _ reconcile.Reconciler = &failRec{}
-var _ inject.Client = &failRec{}
 
 type failRec struct{}
 
 func (*failRec) Reconcile(context.Context, reconcile.Request) (reconcile.Result, error) {
 	return reconcile.Result{}, nil
 }
 
-func (*failRec) InjectClient(client.Client) error {
+func (*failRec) InjectFunc(client.Client) error {
 	return fmt.Errorf("expected error")
 }

pkg/manager/manager_test.go

@@ -1553,13 +1553,6 @@ var _ = Describe("manger.Manager", func() {
 			By("Returning an error if dependency injection fails")
 
 			expected := fmt.Errorf("expected error")
-			err = m.SetFields(&injectable{
-				client: func(client client.Client) error {
-					return expected
-				},
-			})
-			Expect(err).To(Equal(expected))
-
 			err = m.SetFields(&injectable{
 				scheme: func(scheme *runtime.Scheme) error {
 					return expected
@@ -1685,7 +1678,6 @@ var _ = Describe("manger.Manager", func() {
 })
 
 var _ reconcile.Reconciler = &failRec{}
-var _ inject.Client = &failRec{}
 
 type failRec struct{}
 
@@ -1697,12 +1689,11 @@ func (*failRec) Start(context.Context) error {
 	return nil
 }
 
-func (*failRec) InjectClient(client.Client) error {
+func (*failRec) InjectFunc(client.Client) error {
 	return fmt.Errorf("expected error")
 }
 
 var _ inject.Injector = &injectable{}
-var _ inject.Client = &injectable{}
 var _ inject.Scheme = &injectable{}
 var _ inject.Logger = &injectable{}
 

pkg/runtime/inject/inject.go

@@ -23,29 +23,8 @@ import (
 	"github.com/go-logr/logr"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"
-
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-// Client is used by the ControllerManager to inject client into Sources, EventHandlers, Predicates, and
-// Reconciles.
-//
-// Deprecated: Dependency injection methods are deprecated and going to be removed in a future version.
-type Client interface {
-	InjectClient(client.Client) error
-}
-
-// ClientInto will set client on i and return the result if it implements Client. Returns
-// false if i does not implement Client.
-//
-// Deprecated: Dependency injection methods are deprecated and going to be removed in a future version.
-func ClientInto(client client.Client, i interface{}) (bool, error) {
-	if s, ok := i.(Client); ok {
-		return true, s.InjectClient(client)
-	}
-	return false, nil
-}
-
 // Scheme is used by the ControllerManager to inject Scheme into Sources, EventHandlers, Predicates, and
 // Reconciles.
 //

pkg/runtime/inject/inject_test.go

@@ -26,7 +26,6 @@ import (
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 )
 
 var instance *testSource
@@ -40,28 +39,6 @@ var _ = Describe("runtime inject", func() {
 		uninjectable = &failSource{}
 	})
 
-	It("should set client", func() {
-		client, err := client.NewDelegatingClient(client.NewDelegatingClientInput{Client: fake.NewClientBuilder().Build()})
-		Expect(err).NotTo(HaveOccurred())
-
-		By("Validating injecting client")
-		res, err := ClientInto(client, instance)
-		Expect(err).NotTo(HaveOccurred())
-		Expect(res).To(Equal(true))
-		Expect(client).To(Equal(instance.GetClient()))
-
-		By("Returning false if the type does not implement inject.Client")
-		res, err = ClientInto(client, uninjectable)
-		Expect(err).NotTo(HaveOccurred())
-		Expect(res).To(Equal(false))
-		Expect(uninjectable.GetClient()).To(BeNil())
-
-		By("Returning an error if client injection fails")
-		res, err = ClientInto(nil, instance)
-		Expect(err).To(Equal(errInjectFail))
-		Expect(res).To(Equal(true))
-	})
-
 	It("should set scheme", func() {
 
 		scheme := runtime.NewScheme()