Remove inject.Mapper

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

Author: vincepri

pkg/cluster/internal.go

@@ -68,9 +68,6 @@ func (c *cluster) SetFields(i interface{}) error {
 	if _, err := inject.SchemeInto(c.scheme, i); err != nil {
 		return err
 	}
-	if _, err := inject.MapperInto(c.mapper, i); err != nil {
-		return err
-	}
 	return nil
 }
 

pkg/controller/controller_test.go

@@ -25,9 +25,9 @@ import (
 	. "github.com/onsi/gomega"
 	"go.uber.org/goleak"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/utils/pointer"
 
-	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/config/v1alpha1"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/event"
@@ -232,6 +232,6 @@ func (*failRec) Reconcile(context.Context, reconcile.Request) (reconcile.Result,
 	return reconcile.Result{}, nil
 }
 
-func (*failRec) InjectFunc(client.Client) error {
+func (*failRec) InjectScheme(*runtime.Scheme) error {
 	return fmt.Errorf("expected error")
 }

pkg/manager/manager_test.go

@@ -1689,7 +1689,7 @@ func (*failRec) Start(context.Context) error {
 	return nil
 }
 
-func (*failRec) InjectFunc(client.Client) error {
+func (*failRec) InjectScheme(*runtime.Scheme) error {
 	return fmt.Errorf("expected error")
 }
 

pkg/runtime/inject/inject.go

@@ -21,7 +21,6 @@ package inject
 
 import (
 	"github.com/go-logr/logr"
-	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
@@ -44,24 +43,6 @@ func SchemeInto(scheme *runtime.Scheme, i interface{}) (bool, error) {
 	return false, nil
 }
 
-// Mapper is used to inject the rest mapper to components that may need it.
-//
-// Deprecated: Dependency injection methods are deprecated and going to be removed in a future version.
-type Mapper interface {
-	InjectMapper(meta.RESTMapper) error
-}
-
-// MapperInto will set the rest mapper on i and return the result if it implements Mapper.
-// Returns false if i does not implement Mapper.
-//
-// Deprecated: Dependency injection methods are deprecated and going to be removed in a future version.
-func MapperInto(mapper meta.RESTMapper, i interface{}) (bool, error) {
-	if m, ok := i.(Mapper); ok {
-		return true, m.InjectMapper(mapper)
-	}
-	return false, nil
-}
-
 // Func injects dependencies into i.
 //
 // Deprecated: Dependency injection methods are deprecated and going to be removed in a future version.

pkg/runtime/inject/inject_test.go

@@ -39,28 +39,6 @@ var _ = Describe("runtime inject", func() {
 		uninjectable = &failSource{}
 	})
 
-	It("should set scheme", func() {
-
-		scheme := runtime.NewScheme()
-
-		By("Validating injecting scheme")
-		res, err := SchemeInto(scheme, instance)
-		Expect(err).NotTo(HaveOccurred())
-		Expect(res).To(Equal(true))
-		Expect(scheme).To(Equal(instance.GetScheme()))
-
-		By("Returning false if the type does not implement inject.Scheme")
-		res, err = SchemeInto(scheme, uninjectable)
-		Expect(err).NotTo(HaveOccurred())
-		Expect(res).To(Equal(false))
-		Expect(uninjectable.GetScheme()).To(BeNil())
-
-		By("Returning an error if scheme injection fails")
-		res, err = SchemeInto(nil, instance)
-		Expect(err).To(Equal(errInjectFail))
-		Expect(res).To(Equal(true))
-	})
-
 	It("should set dependencies", func() {
 
 		f := func(interface{}) error { return nil }