Remove inject.Config

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

Author: vincepri

pkg/cluster/cluster_test.go

@@ -127,11 +127,6 @@ var _ = Describe("cluster.Cluster", func() {
 					Expect(scheme).To(Equal(c.GetScheme()))
 					return nil
 				},
-				config: func(config *rest.Config) error {
-					defer GinkgoRecover()
-					Expect(config).To(Equal(c.GetConfig()))
-					return nil
-				},
 				client: func(client client.Client) error {
 					defer GinkgoRecover()
 					Expect(client).To(Equal(c.GetClient()))
@@ -161,13 +156,6 @@ var _ = Describe("cluster.Cluster", func() {
 				},
 			})
 			Expect(err).To(Equal(expected))
-
-			err = c.SetFields(&injectable{
-				config: func(config *rest.Config) error {
-					return expected
-				},
-			})
-			Expect(err).To(Equal(expected))
 		})
 	})
 
@@ -233,23 +221,14 @@ var _ = Describe("cluster.Cluster", func() {
 
 var _ inject.Client = &injectable{}
 var _ inject.Scheme = &injectable{}
-var _ inject.Config = &injectable{}
 var _ inject.Logger = &injectable{}
 
 type injectable struct {
 	scheme func(scheme *runtime.Scheme) error
 	client func(client.Client) error
-	config func(config *rest.Config) error
 	log    func(logger logr.Logger) error
 }
 
-func (i *injectable) InjectConfig(config *rest.Config) error {
-	if i.config == nil {
-		return nil
-	}
-	return i.config(config)
-}
-
 func (i *injectable) InjectClient(c client.Client) error {
 	if i.client == nil {
 		return nil

pkg/cluster/internal.go

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

pkg/manager/manager_test.go

@@ -1532,11 +1532,6 @@ var _ = Describe("manger.Manager", func() {
 					Expect(scheme).To(Equal(m.GetScheme()))
 					return nil
 				},
-				config: func(config *rest.Config) error {
-					defer GinkgoRecover()
-					Expect(config).To(Equal(m.GetConfig()))
-					return nil
-				},
 				client: func(client client.Client) error {
 					defer GinkgoRecover()
 					Expect(client).To(Equal(m.GetClient()))
@@ -1572,13 +1567,6 @@ var _ = Describe("manger.Manager", func() {
 			})
 			Expect(err).To(Equal(expected))
 
-			err = m.SetFields(&injectable{
-				config: func(config *rest.Config) error {
-					return expected
-				},
-			})
-			Expect(err).To(Equal(expected))
-
 			err = m.SetFields(&injectable{
 				f: func(c inject.Func) error {
 					return expected
@@ -1716,24 +1704,15 @@ func (*failRec) InjectClient(client.Client) error {
 var _ inject.Injector = &injectable{}
 var _ inject.Client = &injectable{}
 var _ inject.Scheme = &injectable{}
-var _ inject.Config = &injectable{}
 var _ inject.Logger = &injectable{}
 
 type injectable struct {
 	scheme func(scheme *runtime.Scheme) error
 	client func(client.Client) error
-	config func(config *rest.Config) error
 	f      func(inject.Func) error
 	log    func(logger logr.Logger) error
 }
 
-func (i *injectable) InjectConfig(config *rest.Config) error {
-	if i.config == nil {
-		return nil
-	}
-	return i.config(config)
-}
-
 func (i *injectable) InjectClient(c client.Client) error {
 	if i.client == nil {
 		return nil

pkg/runtime/inject/inject.go

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

pkg/runtime/inject/inject_test.go

@@ -40,28 +40,6 @@ var _ = Describe("runtime inject", func() {
 		uninjectable = &failSource{}
 	})
 
-	It("should set config", func() {
-
-		cfg := &rest.Config{}
-
-		By("Validating injecting config")
-		res, err := ConfigInto(cfg, instance)
-		Expect(err).NotTo(HaveOccurred())
-		Expect(res).To(Equal(true))
-		Expect(cfg).To(Equal(instance.GetConfig()))
-
-		By("Returning false if the type does not implement inject.Config")
-		res, err = ConfigInto(cfg, uninjectable)
-		Expect(err).NotTo(HaveOccurred())
-		Expect(res).To(Equal(false))
-		Expect(uninjectable.GetConfig()).To(BeNil())
-
-		By("Returning an error if config injection fails")
-		res, err = ConfigInto(nil, instance)
-		Expect(err).To(Equal(errInjectFail))
-		Expect(res).To(Equal(true))
-	})
-
 	It("should set client", func() {
 		client, err := client.NewDelegatingClient(client.NewDelegatingClientInput{Client: fake.NewClientBuilder().Build()})
 		Expect(err).NotTo(HaveOccurred())