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

Remove debug log

Browse Source 
Signed-off-by: Richard Wall <richard.wall@jetstack.io>
This commit is contained in:
Richard Wall 2020-09-18 10:04:28 +01:00
parent e27e503624
commit e2765f720a
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,9 +128,6 @@ func (o InjectorControllerOptions) RunInjectorController(ctx context.Context) er
<-mgr.Elected()
g.Go(func() (err error) {
defer func() {
o.log.Error(err, "certificate based controller goroutine exited")
}()
for {
err = cainjector.RegisterCertificateBased(gctx, mgr)
if err == nil {
@ -146,9 +143,6 @@ func (o InjectorControllerOptions) RunInjectorController(ctx context.Context) er
})
g.Go(func() (err error) {
defer func() {
o.log.Error(err, "secret based controller goroutine exited")
}()
if err = cainjector.RegisterSecretBased(gctx, mgr); err != nil {
return fmt.Errorf("error registering secret controller: %v", err)
}

17
pkg/controller/cainjector/setup.go
View File

@ -78,8 +78,8 @@ var (
// registerAllInjectors registers all injectors and based on the
// graduation state of the injector decides how to log no kind/resource match errors
func registerAllInjectors(ctx context.Context, groupName string, mgr ctrl.Manager, sources []caDataSource, client client.Client, ca cache.Cache) error {
controllers := map[string]controller.Controller{}
for _, setup := range injectorSetups {
controllers := make([]controller.Controller, len(injectorSetups))
for i, setup := range injectorSetups {
controller, err := Register(groupName, mgr, setup, sources, ca, client)
if err != nil {
if !meta.IsNoMatchError(err) || !setup.injector.IsAlpha() {
@ -89,32 +89,23 @@ func registerAllInjectors(ctx context.Context, groupName string, mgr ctrl.Manage
" Enable the feature on the API server in order to use this injector",
"injector", setup.resourceName)
}
controllers[setup.resourceName] = controller
controllers[i] = controller
}
g, gctx := errgroup.WithContext(ctx)
g.Go(func() (err error) {
defer func() {
ctrl.Log.V(logf.TraceLevel).Error(err, "DEBUG: cache routine finished", "group-name", groupName)
}()
ctrl.Log.V(logf.TraceLevel).Info("DEBUG: cache routine starting", "group-name", groupName)
if err = ca.Start(gctx.Done()); err != nil {
return errors.WithStack(err)
}
return nil
})
if ca.WaitForCacheSync(gctx.Done()) {
for resourceName, controller := range controllers {
for _, controller := range controllers {
if gctx.Err() != nil {
continue
}
resourceName := resourceName
controller := controller
g.Go(func() (err error) {
defer func() {
ctrl.Log.V(logf.TraceLevel).Error(err, "DEBUG: controller routine finished", "group-name", groupName, "resourceName", resourceName)
}()
ctrl.Log.V(logf.TraceLevel).Info("DEBUG: controller routine starting", "group-name", groupName, "resourceName", resourceName)
return controller.Start(gctx.Done())
})
}