Remove inject.Cache

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

Author: vincepri

.golangci.yml

@@ -74,6 +74,8 @@ issues:
   - Subprocess launch(ed with variable|ing should be audited)
   - (G204|G104|G307)
   - "ST1000: at least one file in a package should have a package comment"
+  - "SA1019: \"sigs.k8s.io/controller-runtime/pkg/runtime/inject\""
+  - "SA1019: inject.*"
   exclude-rules:
   - linters:
     - gosec

pkg/cluster/cluster_test.go

@@ -137,11 +137,6 @@ var _ = Describe("cluster.Cluster", func() {
 					Expect(client).To(Equal(c.GetClient()))
 					return nil
 				},
-				cache: func(cache cache.Cache) error {
-					defer GinkgoRecover()
-					Expect(cache).To(Equal(c.GetCache()))
-					return nil
-				},
 				log: func(logger logr.Logger) error {
 					defer GinkgoRecover()
 					Expect(logger).To(Equal(logf.RuntimeLog.WithName("cluster")))
@@ -173,13 +168,6 @@ var _ = Describe("cluster.Cluster", func() {
 				},
 			})
 			Expect(err).To(Equal(expected))
-
-			err = c.SetFields(&injectable{
-				cache: func(c cache.Cache) error {
-					return expected
-				},
-			})
-			Expect(err).To(Equal(expected))
 		})
 	})
 
@@ -243,7 +231,6 @@ var _ = Describe("cluster.Cluster", func() {
 	})
 })
 
-var _ inject.Cache = &injectable{}
 var _ inject.Client = &injectable{}
 var _ inject.Scheme = &injectable{}
 var _ inject.Config = &injectable{}
@@ -253,17 +240,9 @@ type injectable struct {
 	scheme func(scheme *runtime.Scheme) error
 	client func(client.Client) error
 	config func(config *rest.Config) error
-	cache  func(cache.Cache) error
 	log    func(logger logr.Logger) error
 }
 
-func (i *injectable) InjectCache(c cache.Cache) error {
-	if i.cache == nil {
-		return nil
-	}
-	return i.cache(c)
-}
-
 func (i *injectable) InjectConfig(config *rest.Config) error {
 	if i.config == nil {
 		return nil

pkg/cluster/internal.go

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

pkg/manager/manager_test.go

@@ -1542,11 +1542,6 @@ var _ = Describe("manger.Manager", func() {
 					Expect(client).To(Equal(m.GetClient()))
 					return nil
 				},
-				cache: func(c cache.Cache) error {
-					defer GinkgoRecover()
-					Expect(c).To(Equal(m.GetCache()))
-					return nil
-				},
 				f: func(f inject.Func) error {
 					defer GinkgoRecover()
 					Expect(f).NotTo(BeNil())
@@ -1584,13 +1579,6 @@ var _ = Describe("manger.Manager", func() {
 			})
 			Expect(err).To(Equal(expected))
 
-			err = m.SetFields(&injectable{
-				cache: func(c cache.Cache) error {
-					return expected
-				},
-			})
-			Expect(err).To(Equal(expected))
-
 			err = m.SetFields(&injectable{
 				f: func(c inject.Func) error {
 					return expected
@@ -1726,7 +1714,6 @@ func (*failRec) InjectClient(client.Client) error {
 }
 
 var _ inject.Injector = &injectable{}
-var _ inject.Cache = &injectable{}
 var _ inject.Client = &injectable{}
 var _ inject.Scheme = &injectable{}
 var _ inject.Config = &injectable{}
@@ -1736,18 +1723,10 @@ type injectable struct {
 	scheme func(scheme *runtime.Scheme) error
 	client func(client.Client) error
 	config func(config *rest.Config) error
-	cache  func(cache.Cache) error
 	f      func(inject.Func) error
 	log    func(logger logr.Logger) error
 }
 
-func (i *injectable) InjectCache(c cache.Cache) error {
-	if i.cache == nil {
-		return nil
-	}
-	return i.cache(c)
-}
-
 func (i *injectable) InjectConfig(config *rest.Config) error {
 	if i.config == nil {
 		return nil

pkg/runtime/inject/inject.go

@@ -25,29 +25,9 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/rest"
 
-	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-// Cache is used by the ControllerManager to inject Cache into Sources, EventHandlers, Predicates, and
-// Reconciles.
-//
-// Deprecated: Dependency injection methods are deprecated and going to be removed in a future version.
-type Cache interface {
-	InjectCache(cache cache.Cache) error
-}
-
-// CacheInto will set informers on i and return the result if it implements Cache.  Returns
-// false if i does not implement Cache.
-//
-// Deprecated: Dependency injection methods are deprecated and going to be removed in a future version.
-func CacheInto(c cache.Cache, i interface{}) (bool, error) {
-	if s, ok := i.(Cache); ok {
-		return true, s.InjectCache(c)
-	}
-	return false, nil
-}
-
 // 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.

pkg/runtime/inject/inject_test.go

@@ -25,15 +25,13 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/rest"
 	"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
 var uninjectable *failSource
 var errInjectFail = fmt.Errorf("injection fails")
-var expectedFalse = false
 
 var _ = Describe("runtime inject", func() {
 
@@ -42,28 +40,6 @@ var _ = Describe("runtime inject", func() {
 		uninjectable = &failSource{}
 	})
 
-	It("should set informers", func() {
-		injectedCache := &informertest.FakeInformers{}
-
-		By("Validating injecting the informer")
-		res, err := CacheInto(injectedCache, instance)
-		Expect(err).NotTo(HaveOccurred())
-		Expect(res).To(Equal(true))
-		Expect(injectedCache).To(Equal(instance.GetCache()))
-
-		By("Returning false if the type does not implement inject.Cache")
-		res, err = CacheInto(injectedCache, uninjectable)
-		Expect(err).NotTo(HaveOccurred())
-		Expect(res).To(Equal(expectedFalse))
-		Expect(uninjectable.GetCache()).To(BeNil())
-
-		By("Returning an error if informer injection fails")
-		res, err = CacheInto(nil, instance)
-		Expect(err).To(Equal(errInjectFail))
-		Expect(res).To(Equal(true))
-
-	})
-
 	It("should set config", func() {
 
 		cfg := &rest.Config{}
@@ -186,14 +162,6 @@ type testSource struct {
 	stop      <-chan struct{}
 }
 
-func (s *testSource) InjectCache(c cache.Cache) error {
-	if c != nil {
-		s.cache = c
-		return nil
-	}
-	return fmt.Errorf("injection fails")
-}
-
 func (s *testSource) InjectConfig(config *rest.Config) error {
 	if config != nil {
 		s.config = config