mirror of
https://github.com/kyverno/kyverno.git
synced 2025-03-15 12:17:56 +00:00
[Feat] TTL controller log improvements (#8112)
* upgraded verbose and enhanced label Signed-off-by: Ved Ratan <vedratan8@gmail.com> * enhancements Signed-off-by: Ved Ratan <vedratan8@gmail.com> * fix Signed-off-by: Ved Ratan <vedratan8@gmail.com> * fix Signed-off-by: Ved Ratan <vedratan8@gmail.com> --------- Signed-off-by: Ved Ratan <vedratan8@gmail.com>
This commit is contained in:
parent
c751f1de58
commit
ebd9506f87
3 changed files with 11 additions and 10 deletions
|
@ -2,6 +2,7 @@ package resource
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/go-logr/logr"
|
"github.com/go-logr/logr"
|
||||||
|
@ -18,7 +19,7 @@ func Validate(ctx context.Context, logger logr.Logger, request handlers.Admissio
|
||||||
}
|
}
|
||||||
if err := validation.ValidateTtlLabel(ctx, metadata); err != nil {
|
if err := validation.ValidateTtlLabel(ctx, metadata); err != nil {
|
||||||
logger.Error(err, "metadatas validation errors")
|
logger.Error(err, "metadatas validation errors")
|
||||||
return admissionutils.ResponseSuccess(request.UID, err.Error())
|
return admissionutils.ResponseSuccess(request.UID, fmt.Sprintf("cleanup.kyverno.io/ttl label value cannot be parsed as any recognizable format (%s)", err.Error()))
|
||||||
}
|
}
|
||||||
return admissionutils.ResponseSuccess(request.UID)
|
return admissionutils.ResponseSuccess(request.UID)
|
||||||
}
|
}
|
||||||
|
|
|
@ -97,19 +97,19 @@ func (c *controller) handleUpdate(oldObj, newObj interface{}) {
|
||||||
func (c *controller) Start(ctx context.Context, workers int) {
|
func (c *controller) Start(ctx context.Context, workers int) {
|
||||||
for i := 0; i < workers; i++ {
|
for i := 0; i < workers; i++ {
|
||||||
c.wg.StartWithContext(ctx, func(ctx context.Context) {
|
c.wg.StartWithContext(ctx, func(ctx context.Context) {
|
||||||
defer c.logger.Info("worker stopped")
|
defer c.logger.V(3).Info("worker stopped")
|
||||||
c.logger.Info("worker starting ....")
|
c.logger.V(3).Info("worker starting ....")
|
||||||
wait.UntilWithContext(ctx, c.worker, 1*time.Second)
|
wait.UntilWithContext(ctx, c.worker, 1*time.Second)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *controller) Stop() {
|
func (c *controller) Stop() {
|
||||||
defer c.logger.Info("queue stopped")
|
defer c.logger.V(3).Info("queue stopped")
|
||||||
defer c.wg.Wait()
|
defer c.wg.Wait()
|
||||||
// Unregister the event handlers
|
// Unregister the event handlers
|
||||||
c.deregisterEventHandlers()
|
c.deregisterEventHandlers()
|
||||||
c.logger.Info("queue stopping ....")
|
c.logger.V(3).Info("queue stopping ....")
|
||||||
c.queue.ShutDown()
|
c.queue.ShutDown()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -129,7 +129,7 @@ func (c *controller) deregisterEventHandlers() {
|
||||||
c.logger.Error(err, "failed to deregister event handlers")
|
c.logger.Error(err, "failed to deregister event handlers")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
c.logger.Info("deregistered event handlers")
|
c.logger.V(3).Info("deregistered event handlers")
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *controller) worker(ctx context.Context) {
|
func (c *controller) worker(ctx context.Context) {
|
||||||
|
|
|
@ -130,7 +130,7 @@ func (m *manager) start(ctx context.Context, gvr schema.GroupVersionResource, wo
|
||||||
cont, cancel := context.WithCancel(ctx)
|
cont, cancel := context.WithCancel(ctx)
|
||||||
var wg wait.Group
|
var wg wait.Group
|
||||||
wg.StartWithContext(cont, func(ctx context.Context) {
|
wg.StartWithContext(cont, func(ctx context.Context) {
|
||||||
logger.Info("informer starting...")
|
logger.V(3).Info("informer starting...")
|
||||||
informer.Informer().Run(cont.Done())
|
informer.Informer().Run(cont.Done())
|
||||||
})
|
})
|
||||||
stopInformer := func() {
|
stopInformer := func() {
|
||||||
|
@ -148,7 +148,7 @@ func (m *manager) start(ctx context.Context, gvr schema.GroupVersionResource, wo
|
||||||
stopInformer()
|
stopInformer()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
logger.Info("controller starting...")
|
logger.V(3).Info("controller starting...")
|
||||||
controller.Start(cont, workers)
|
controller.Start(cont, workers)
|
||||||
m.resController[gvr] = func() {
|
m.resController[gvr] = func() {
|
||||||
stopInformer()
|
stopInformer()
|
||||||
|
@ -169,8 +169,8 @@ func (m *manager) filterPermissionsResource(resources []schema.GroupVersionResou
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *manager) reconcile(ctx context.Context, workers int) error {
|
func (m *manager) reconcile(ctx context.Context, workers int) error {
|
||||||
defer m.logger.Info("manager reconciliation done")
|
defer m.logger.V(3).Info("manager reconciliation done")
|
||||||
m.logger.Info("start manager reconciliation")
|
m.logger.V(3).Info("beginning reconciliation", "interval", m.interval)
|
||||||
desiredState, err := m.getDesiredState()
|
desiredState, err := m.getDesiredState()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
Loading…
Add table
Reference in a new issue