From 95aa3aab95d31f0aeec5ebc6c64558d2a20573ce Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Tue, 22 Aug 2017 12:04:43 +0100 Subject: [PATCH] Update references to cert-manager informers --- cmd/controller/main.go | 4 ++-- pkg/controller/certificates/controller.go | 4 ++-- pkg/controller/factory.go | 8 ++++---- pkg/controller/issuers/controller.go | 4 ++-- pkg/issuer/acme/acme.go | 6 +++--- pkg/issuer/factory.go | 6 +++--- pkg/issuer/interface.go | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/cmd/controller/main.go b/cmd/controller/main.go index 636aaa16f..c7fe3443b 100644 --- a/cmd/controller/main.go +++ b/cmd/controller/main.go @@ -33,7 +33,7 @@ import ( "github.com/jetstack-experimental/cert-manager/pkg/controller" "github.com/jetstack-experimental/cert-manager/pkg/controller/certificates" "github.com/jetstack-experimental/cert-manager/pkg/controller/issuers" - "github.com/jetstack-experimental/cert-manager/pkg/informers/externalversions" + cminformers "github.com/jetstack-experimental/cert-manager/pkg/informers" "github.com/jetstack-experimental/cert-manager/pkg/issuer" _ "github.com/jetstack-experimental/cert-manager/pkg/issuer/acme" logpkg "github.com/jetstack-experimental/cert-manager/pkg/log" @@ -71,7 +71,7 @@ func main() { } factory := informers.NewSharedInformerFactory(cl, time.Second*30) - cmFactory := externalversions.NewSharedInformerFactory(cmCl, time.Second*30) + cmFactory := cminformers.NewSharedInformerFactory(cmCl, time.Second*30) issuer.SharedFactory().Setup(cl, cmCl, factory, cmFactory) controller.SharedFactory().Setup(cl, cmCl, factory, cmFactory) diff --git a/pkg/controller/certificates/controller.go b/pkg/controller/certificates/controller.go index 781177b35..f08037772 100644 --- a/pkg/controller/certificates/controller.go +++ b/pkg/controller/certificates/controller.go @@ -20,7 +20,7 @@ import ( "github.com/jetstack-experimental/cert-manager/pkg/apis/certmanager/v1alpha1" "github.com/jetstack-experimental/cert-manager/pkg/client" controllerpkg "github.com/jetstack-experimental/cert-manager/pkg/controller" - "github.com/jetstack-experimental/cert-manager/pkg/informers/externalversions" + cminformers "github.com/jetstack-experimental/cert-manager/pkg/informers" cmlisters "github.com/jetstack-experimental/cert-manager/pkg/listers/certmanager/v1alpha1" "github.com/jetstack-experimental/cert-manager/pkg/log" "github.com/jetstack-experimental/cert-manager/pkg/scheduler" @@ -58,7 +58,7 @@ type controller struct { func New(client kubernetes.Interface, cmClient client.Interface, factory informers.SharedInformerFactory, - cmFactory externalversions.SharedInformerFactory) (controllerpkg.Controller, error) { + cmFactory cminformers.SharedInformerFactory) (controllerpkg.Controller, error) { ctrl := &controller{client: client, cmClient: cmClient} ctrl.syncHandler = ctrl.processNextWorkItem diff --git a/pkg/controller/factory.go b/pkg/controller/factory.go index 61674af0b..23a25682e 100644 --- a/pkg/controller/factory.go +++ b/pkg/controller/factory.go @@ -8,7 +8,7 @@ import ( "k8s.io/client-go/kubernetes" "github.com/jetstack-experimental/cert-manager/pkg/client" - "github.com/jetstack-experimental/cert-manager/pkg/informers/externalversions" + cminformers "github.com/jetstack-experimental/cert-manager/pkg/informers" ) var defaultFactory = &Factory{ @@ -30,13 +30,13 @@ type Factory struct { client kubernetes.Interface cmClient client.Interface factory informers.SharedInformerFactory - cmFactory externalversions.SharedInformerFactory + cmFactory cminformers.SharedInformerFactory } func (f *Factory) Setup(client kubernetes.Interface, cmClient client.Interface, factory informers.SharedInformerFactory, - cmFactory externalversions.SharedInformerFactory) { + cmFactory cminformers.SharedInformerFactory) { f.client = client f.cmClient = cmClient f.factory = factory @@ -96,7 +96,7 @@ func (f *Factory) initController(name string) (Controller, error) { type Constructor func(client kubernetes.Interface, cmClient client.Interface, factory informers.SharedInformerFactory, - cmFactory externalversions.SharedInformerFactory) (Controller, error) + cmFactory cminformers.SharedInformerFactory) (Controller, error) // Controller is a control loop to be run within cert-manager. It should watch // and act on a single resource type in an API server. diff --git a/pkg/controller/issuers/controller.go b/pkg/controller/issuers/controller.go index 509229640..928f4d847 100644 --- a/pkg/controller/issuers/controller.go +++ b/pkg/controller/issuers/controller.go @@ -18,7 +18,7 @@ import ( "github.com/jetstack-experimental/cert-manager/pkg/apis/certmanager/v1alpha1" "github.com/jetstack-experimental/cert-manager/pkg/client" controllerpkg "github.com/jetstack-experimental/cert-manager/pkg/controller" - "github.com/jetstack-experimental/cert-manager/pkg/informers/externalversions" + cminformers "github.com/jetstack-experimental/cert-manager/pkg/informers" cmlisters "github.com/jetstack-experimental/cert-manager/pkg/listers/certmanager/v1alpha1" "github.com/jetstack-experimental/cert-manager/pkg/log" ) @@ -49,7 +49,7 @@ type controller struct { func New(client kubernetes.Interface, cmClient client.Interface, factory informers.SharedInformerFactory, - cmFactory externalversions.SharedInformerFactory) (controllerpkg.Controller, error) { + cmFactory cminformers.SharedInformerFactory) (controllerpkg.Controller, error) { ctrl := &controller{client: client, cmClient: cmClient} ctrl.syncHandler = ctrl.processNextWorkItem diff --git a/pkg/issuer/acme/acme.go b/pkg/issuer/acme/acme.go index dba6da830..b60da5bf2 100644 --- a/pkg/issuer/acme/acme.go +++ b/pkg/issuer/acme/acme.go @@ -9,7 +9,7 @@ import ( "github.com/jetstack-experimental/cert-manager/pkg/apis/certmanager/v1alpha1" "github.com/jetstack-experimental/cert-manager/pkg/client" - "github.com/jetstack-experimental/cert-manager/pkg/informers/externalversions" + cminformers "github.com/jetstack-experimental/cert-manager/pkg/informers" "github.com/jetstack-experimental/cert-manager/pkg/issuer" "github.com/jetstack-experimental/cert-manager/pkg/issuer/acme/dns" "github.com/jetstack-experimental/cert-manager/pkg/issuer/acme/http" @@ -21,7 +21,7 @@ type Acme struct { client kubernetes.Interface cmClient client.Interface factory informers.SharedInformerFactory - cmFactory externalversions.SharedInformerFactory + cmFactory cminformers.SharedInformerFactory dnsSolver solver httpSolver solver @@ -31,7 +31,7 @@ func New(issuer *v1alpha1.Issuer, client kubernetes.Interface, cmClient client.Interface, factory informers.SharedInformerFactory, - cmFactory externalversions.SharedInformerFactory) (issuer.Interface, error) { + cmFactory cminformers.SharedInformerFactory) (issuer.Interface, error) { return &Acme{ account: newAccount(issuer, client, factory.Core().V1().Secrets().Lister()), client: client, diff --git a/pkg/issuer/factory.go b/pkg/issuer/factory.go index 1a8de422d..8a81009c9 100644 --- a/pkg/issuer/factory.go +++ b/pkg/issuer/factory.go @@ -9,7 +9,7 @@ import ( "github.com/jetstack-experimental/cert-manager/pkg/apis/certmanager/v1alpha1" "github.com/jetstack-experimental/cert-manager/pkg/client" - "github.com/jetstack-experimental/cert-manager/pkg/informers/externalversions" + cminformers "github.com/jetstack-experimental/cert-manager/pkg/informers" "github.com/jetstack-experimental/cert-manager/pkg/log" ) @@ -20,13 +20,13 @@ type Factory struct { client kubernetes.Interface cmClient client.Interface factory informers.SharedInformerFactory - cmFactory externalversions.SharedInformerFactory + cmFactory cminformers.SharedInformerFactory } func (f *Factory) Setup(client kubernetes.Interface, cmClient client.Interface, factory informers.SharedInformerFactory, - cmFactory externalversions.SharedInformerFactory) { + cmFactory cminformers.SharedInformerFactory) { f.client = client f.cmClient = cmClient f.factory = factory diff --git a/pkg/issuer/interface.go b/pkg/issuer/interface.go index 897e00b1e..89af6da17 100644 --- a/pkg/issuer/interface.go +++ b/pkg/issuer/interface.go @@ -6,7 +6,7 @@ import ( "github.com/jetstack-experimental/cert-manager/pkg/apis/certmanager/v1alpha1" "github.com/jetstack-experimental/cert-manager/pkg/client" - "github.com/jetstack-experimental/cert-manager/pkg/informers/externalversions" + cminformers "github.com/jetstack-experimental/cert-manager/pkg/informers" ) var sharedFactory = &Factory{ @@ -21,7 +21,7 @@ type Constructor func(issuer *v1alpha1.Issuer, client kubernetes.Interface, cmClient client.Interface, factory informers.SharedInformerFactory, - cmFactory externalversions.SharedInformerFactory) (Interface, error) + cmFactory cminformers.SharedInformerFactory) (Interface, error) type Interface interface { // Setup initialises the issuer. This may include registering accounts with