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

Merge pull request #3187 from meyskens/cainject-le

Browse Source 
Refactor the cainjector to only have 1 leader election
This commit is contained in:
jetstack-bot 2020-08-18 10:49:43 +01:00 committed by GitHub
commit fff2778ae2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
cmd/cainjector/app/start.go
View File

@ -98,20 +98,6 @@ servers and webhook servers.`,
}
func (o InjectorControllerOptions) RunInjectorController(stopCh <-chan struct{}) {
eitherStopCh := make(chan struct{})
go func() {
defer close(eitherStopCh)
o.runCertificateBasedInjector(stopCh)
}()
go func() {
defer close(eitherStopCh)
o.runSecretBasedInjector(stopCh)
}()
<-eitherStopCh
}
func (o InjectorControllerOptions) runCertificateBasedInjector(stopCh <-chan struct{}) {
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
Scheme: api.Scheme,
Namespace: o.Namespace,
@ -126,10 +112,13 @@ func (o InjectorControllerOptions) runCertificateBasedInjector(stopCh <-chan str
os.Exit(1)
}
// TODO(directxman12): enabled controllers for separate injectors?
if err := cainjector.RegisterCertificateBased(mgr); err != nil {
err = cainjector.RegisterCertificateBased(mgr)
if err != nil {
o.log.Error(err, "error registering controllers")
}
err = cainjector.RegisterSecretBased(mgr)
if err != nil {
o.log.Error(err, "error registering controllers")
os.Exit(1)
}
if err := mgr.Start(stopCh); err != nil {
@ -137,30 +126,3 @@ func (o InjectorControllerOptions) runCertificateBasedInjector(stopCh <-chan str
os.Exit(1)
}
}
func (o InjectorControllerOptions) runSecretBasedInjector(stopCh <-chan struct{}) {
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
Scheme: api.Scheme,
Namespace: o.Namespace,
LeaderElection: o.LeaderElect,
LeaderElectionNamespace: o.LeaderElectionNamespace,
LeaderElectionID: "cert-manager-cainjector-leader-election-core",
MetricsBindAddress: "0",
})
if err != nil {
o.log.Error(err, "error creating core-only manager")
os.Exit(1)
}
// TODO(directxman12): enabled controllers for separate injectors?
if err := cainjector.RegisterSecretBased(mgr); err != nil {
o.log.Error(err, "error registering core-only controllers")
os.Exit(1)
}
if err := mgr.Start(stopCh); err != nil {
o.log.Error(err, "error running core-only manager")
os.Exit(1)
}
}