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

Update references to cert-manager informers

Browse Source
This commit is contained in:
James Munnelly 2017-08-22 12:04:43 +01:00
parent 3b8fb796d8
commit 95aa3aab95
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/controller/main.go
View File

@ -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)

4
pkg/controller/certificates/controller.go
View File

@ -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

8
pkg/controller/factory.go
View File

@ -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.

4
pkg/controller/issuers/controller.go
View File

@ -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

6
pkg/issuer/acme/acme.go
View File

@ -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,

6
pkg/issuer/factory.go
View File

@ -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

4
pkg/issuer/interface.go
View File

@ -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