From 40b68a3e10b4e5a7b82768a275cdfce844863e5d Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Thu, 10 Jan 2019 12:54:22 +0000 Subject: [PATCH] Fix more references to clusterIssuer Signed-off-by: Louis Taylor --- pkg/controller/acmechallenges/controller.go | 10 ++++++---- pkg/controller/acmeorders/controller.go | 10 ++++++---- pkg/controller/ingress-shim/controller.go | 13 ++++++++++--- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/pkg/controller/acmechallenges/controller.go b/pkg/controller/acmechallenges/controller.go index fcb3348f6..aa0e51f65 100644 --- a/pkg/controller/acmechallenges/controller.go +++ b/pkg/controller/acmechallenges/controller.go @@ -83,10 +83,12 @@ func New(ctx *controllerpkg.Context) *Controller { ctrl.watchedInformers = append(ctrl.watchedInformers, issuerInformer.Informer().HasSynced) ctrl.issuerLister = issuerInformer.Lister() - // clusterIssuerInformer.Informer().AddEventHandler(&controllerpkg.QueuingEventHandler{Queue: ctrl.queue}) - clusterIssuerInformer := ctrl.SharedInformerFactory.Certmanager().V1alpha1().ClusterIssuers() - ctrl.watchedInformers = append(ctrl.watchedInformers, clusterIssuerInformer.Informer().HasSynced) - ctrl.clusterIssuerLister = clusterIssuerInformer.Lister() + if ctx.Namespace == "" { + // clusterIssuerInformer.Informer().AddEventHandler(&controllerpkg.QueuingEventHandler{Queue: ctrl.queue}) + clusterIssuerInformer := ctrl.SharedInformerFactory.Certmanager().V1alpha1().ClusterIssuers() + ctrl.watchedInformers = append(ctrl.watchedInformers, clusterIssuerInformer.Informer().HasSynced) + ctrl.clusterIssuerLister = clusterIssuerInformer.Lister() + } secretInformer := ctrl.KubeSharedInformerFactory.Core().V1().Secrets() ctrl.watchedInformers = append(ctrl.watchedInformers, secretInformer.Informer().HasSynced) diff --git a/pkg/controller/acmeorders/controller.go b/pkg/controller/acmeorders/controller.go index 620ebb13d..40facc453 100644 --- a/pkg/controller/acmeorders/controller.go +++ b/pkg/controller/acmeorders/controller.go @@ -77,10 +77,12 @@ func New(ctx *controllerpkg.Context) *Controller { ctrl.watchedInformers = append(ctrl.watchedInformers, issuerInformer.Informer().HasSynced) ctrl.issuerLister = issuerInformer.Lister() - clusterIssuerInformer := ctrl.SharedInformerFactory.Certmanager().V1alpha1().ClusterIssuers() - clusterIssuerInformer.Informer().AddEventHandler(&controllerpkg.BlockingEventHandler{WorkFunc: ctrl.handleGenericIssuer}) - ctrl.watchedInformers = append(ctrl.watchedInformers, clusterIssuerInformer.Informer().HasSynced) - ctrl.clusterIssuerLister = clusterIssuerInformer.Lister() + if ctx.Namespace == "" { + clusterIssuerInformer := ctrl.SharedInformerFactory.Certmanager().V1alpha1().ClusterIssuers() + clusterIssuerInformer.Informer().AddEventHandler(&controllerpkg.BlockingEventHandler{WorkFunc: ctrl.handleGenericIssuer}) + ctrl.watchedInformers = append(ctrl.watchedInformers, clusterIssuerInformer.Informer().HasSynced) + ctrl.clusterIssuerLister = clusterIssuerInformer.Lister() + } challengeInformer := ctrl.SharedInformerFactory.Certmanager().V1alpha1().Challenges() challengeInformer.Informer().AddEventHandler(&controllerpkg.BlockingEventHandler{WorkFunc: ctrl.handleOwnedResource}) diff --git a/pkg/controller/ingress-shim/controller.go b/pkg/controller/ingress-shim/controller.go index 676004df5..74261a08c 100644 --- a/pkg/controller/ingress-shim/controller.go +++ b/pkg/controller/ingress-shim/controller.go @@ -97,8 +97,11 @@ func New( ctrl.issuerLister = issuerInformer.Lister() ctrl.syncedFuncs = append(ctrl.syncedFuncs, issuerInformer.Informer().HasSynced) - ctrl.clusterIssuerLister = clusterIssuerInformer.Lister() - ctrl.syncedFuncs = append(ctrl.syncedFuncs, clusterIssuerInformer.Informer().HasSynced) + + if clusterIssuerInformer != nil { + ctrl.clusterIssuerLister = clusterIssuerInformer.Lister() + ctrl.syncedFuncs = append(ctrl.syncedFuncs, clusterIssuerInformer.Informer().HasSynced) + } return ctrl } @@ -205,11 +208,15 @@ var keyFunc = controllerpkg.KeyFunc func init() { controllerpkg.Register(ControllerName, func(ctx *controllerpkg.Context) controllerpkg.Interface { + var clusterIssuerInformer cminformers.ClusterIssuerInformer + if ctx.Namespace == "" { + clusterIssuerInformer = ctx.SharedInformerFactory.Certmanager().V1alpha1().ClusterIssuers() + } return New( ctx.SharedInformerFactory.Certmanager().V1alpha1().Certificates(), ctx.KubeSharedInformerFactory.Extensions().V1beta1().Ingresses(), ctx.SharedInformerFactory.Certmanager().V1alpha1().Issuers(), - ctx.SharedInformerFactory.Certmanager().V1alpha1().ClusterIssuers(), + clusterIssuerInformer, ctx.Client, ctx.CMClient, ctx.Recorder,