Remove inject.APIReader

Signed-off-by: Vince Prignano <[email protected]>

Author: vincepri

pkg/cluster/internal.go

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

pkg/runtime/inject/inject.go

@@ -28,24 +28,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-// APIReader is used by the Manager to inject the APIReader into necessary types.
-//
-// Deprecated: Dependency injection methods are deprecated and going to be removed in a future version.
-type APIReader interface {
-	InjectAPIReader(client.Reader) error
-}
-
-// APIReaderInto will set APIReader on i and return the result if it implements APIReaderInto.
-// Returns false if i does not implement APIReader.
-//
-// Deprecated: Dependency injection methods are deprecated and going to be removed in a future version.
-func APIReaderInto(reader client.Reader, i interface{}) (bool, error) {
-	if s, ok := i.(APIReader); ok {
-		return true, s.InjectAPIReader(reader)
-	}
-	return false, nil
-}
-
 // Config is used by the ControllerManager to inject Config into Sources, EventHandlers, Predicates, and
 // Reconciles.
 //

pkg/runtime/inject/inject_test.go

@@ -106,28 +106,6 @@ var _ = Describe("runtime inject", func() {
 		Expect(res).To(Equal(true))
 	})
 
-	It("should set api reader", func() {
-		apiReader, err := client.NewDelegatingClient(client.NewDelegatingClientInput{Client: fake.NewClientBuilder().Build()})
-		Expect(err).NotTo(HaveOccurred())
-
-		By("Validating injecting client")
-		res, err := APIReaderInto(apiReader, instance)
-		Expect(err).NotTo(HaveOccurred())
-		Expect(res).To(Equal(true))
-		Expect(apiReader).To(Equal(instance.GetAPIReader()))
-
-		By("Returning false if the type does not implement inject.Client")
-		res, err = APIReaderInto(apiReader, uninjectable)
-		Expect(err).NotTo(HaveOccurred())
-		Expect(res).To(Equal(false))
-		Expect(uninjectable.GetAPIReader()).To(BeNil())
-
-		By("Returning an error if client injection fails")
-		res, err = APIReaderInto(nil, instance)
-		Expect(err).To(Equal(errInjectFail))
-		Expect(res).To(Equal(true))
-	})
-
 	It("should set dependencies", func() {
 
 		f := func(interface{}) error { return nil }