weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix more references to clusterIssuer

Browse Source 
Signed-off-by: Louis Taylor <louis@kragniz.eu>
This commit is contained in:
Louis Taylor 2019-01-10 12:54:22 +00:00
parent bbda87b3c8
commit 40b68a3e10
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/controller/acmechallenges/controller.go
View File

@ -83,10 +83,12 @@ func New(ctx *controllerpkg.Context) *Controller {
ctrl.watchedInformers = append(ctrl.watchedInformers, issuerInformer.Informer().HasSynced) ctrl.watchedInformers = append(ctrl.watchedInformers, issuerInformer.Informer().HasSynced)
ctrl.issuerLister = issuerInformer.Lister() ctrl.issuerLister = issuerInformer.Lister()
// clusterIssuerInformer.Informer().AddEventHandler(&controllerpkg.QueuingEventHandler{Queue: ctrl.queue}) if ctx.Namespace == "" {
clusterIssuerInformer := ctrl.SharedInformerFactory.Certmanager().V1alpha1().ClusterIssuers() // clusterIssuerInformer.Informer().AddEventHandler(&controllerpkg.QueuingEventHandler{Queue: ctrl.queue})
ctrl.watchedInformers = append(ctrl.watchedInformers, clusterIssuerInformer.Informer().HasSynced) clusterIssuerInformer := ctrl.SharedInformerFactory.Certmanager().V1alpha1().ClusterIssuers()
ctrl.clusterIssuerLister = clusterIssuerInformer.Lister() ctrl.watchedInformers = append(ctrl.watchedInformers, clusterIssuerInformer.Informer().HasSynced)
ctrl.clusterIssuerLister = clusterIssuerInformer.Lister()
}
secretInformer := ctrl.KubeSharedInformerFactory.Core().V1().Secrets() secretInformer := ctrl.KubeSharedInformerFactory.Core().V1().Secrets()
ctrl.watchedInformers = append(ctrl.watchedInformers, secretInformer.Informer().HasSynced) ctrl.watchedInformers = append(ctrl.watchedInformers, secretInformer.Informer().HasSynced)

10
pkg/controller/acmeorders/controller.go
View File

@ -77,10 +77,12 @@ func New(ctx *controllerpkg.Context) *Controller {
ctrl.watchedInformers = append(ctrl.watchedInformers, issuerInformer.Informer().HasSynced) ctrl.watchedInformers = append(ctrl.watchedInformers, issuerInformer.Informer().HasSynced)
ctrl.issuerLister = issuerInformer.Lister() ctrl.issuerLister = issuerInformer.Lister()
clusterIssuerInformer := ctrl.SharedInformerFactory.Certmanager().V1alpha1().ClusterIssuers() if ctx.Namespace == "" {
clusterIssuerInformer.Informer().AddEventHandler(&controllerpkg.BlockingEventHandler{WorkFunc: ctrl.handleGenericIssuer}) clusterIssuerInformer := ctrl.SharedInformerFactory.Certmanager().V1alpha1().ClusterIssuers()
ctrl.watchedInformers = append(ctrl.watchedInformers, clusterIssuerInformer.Informer().HasSynced) clusterIssuerInformer.Informer().AddEventHandler(&controllerpkg.BlockingEventHandler{WorkFunc: ctrl.handleGenericIssuer})
ctrl.clusterIssuerLister = clusterIssuerInformer.Lister() ctrl.watchedInformers = append(ctrl.watchedInformers, clusterIssuerInformer.Informer().HasSynced)
ctrl.clusterIssuerLister = clusterIssuerInformer.Lister()
}
challengeInformer := ctrl.SharedInformerFactory.Certmanager().V1alpha1().Challenges() challengeInformer := ctrl.SharedInformerFactory.Certmanager().V1alpha1().Challenges()
challengeInformer.Informer().AddEventHandler(&controllerpkg.BlockingEventHandler{WorkFunc: ctrl.handleOwnedResource}) challengeInformer.Informer().AddEventHandler(&controllerpkg.BlockingEventHandler{WorkFunc: ctrl.handleOwnedResource})

13
pkg/controller/ingress-shim/controller.go
View File

@ -97,8 +97,11 @@ func New(
ctrl.issuerLister = issuerInformer.Lister() ctrl.issuerLister = issuerInformer.Lister()
ctrl.syncedFuncs = append(ctrl.syncedFuncs, issuerInformer.Informer().HasSynced) 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 return ctrl
} }
@ -205,11 +208,15 @@ var keyFunc = controllerpkg.KeyFunc
func init() { func init() {
controllerpkg.Register(ControllerName, func(ctx *controllerpkg.Context) controllerpkg.Interface { controllerpkg.Register(ControllerName, func(ctx *controllerpkg.Context) controllerpkg.Interface {
var clusterIssuerInformer cminformers.ClusterIssuerInformer
if ctx.Namespace == "" {
clusterIssuerInformer = ctx.SharedInformerFactory.Certmanager().V1alpha1().ClusterIssuers()
}
return New( return New(
ctx.SharedInformerFactory.Certmanager().V1alpha1().Certificates(), ctx.SharedInformerFactory.Certmanager().V1alpha1().Certificates(),
ctx.KubeSharedInformerFactory.Extensions().V1beta1().Ingresses(), ctx.KubeSharedInformerFactory.Extensions().V1beta1().Ingresses(),
ctx.SharedInformerFactory.Certmanager().V1alpha1().Issuers(), ctx.SharedInformerFactory.Certmanager().V1alpha1().Issuers(),
ctx.SharedInformerFactory.Certmanager().V1alpha1().ClusterIssuers(), clusterIssuerInformer,
ctx.Client, ctx.Client,
ctx.CMClient, ctx.CMClient,
ctx.Recorder, ctx.Recorder,