mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-28 02:18:15 +00:00
Code Activity

fix: update policy status (#5006)

Browse source 
Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>
This commit is contained in:
Charles-Edouard Brétéché 2022-10-17 11:28:33 +02:00 • committed by GitHub
parent 2bd6c62b55
commit 02e832a771
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkg/controllers/webhook/controller.go
View file

@ -96,7 +96,7 @@ type controller struct {
runtime runtimeutils.Runtime
// state
lock sync.RWMutex
lock sync.Mutex
policyState map[string]sets.String
}
@ -201,7 +201,7 @@ func (c *controller) Run(ctx context.Context, workers int) {
// add our known webhooks to the queue
c.enqueueAll()
go c.watchdog(ctx)
controllerutils.Run(ctx, ControllerName, logger.V(3), c.queue, workers, maxRetries, c.reconcile)
controllerutils.Run(ctx, ControllerName, logger, c.queue, workers, maxRetries, c.reconcile)
}
func (c *controller) watchdog(ctx context.Context) {
@ -297,8 +297,9 @@ func (c *controller) recordPolicyState(webhookConfigurationName string, policies
policyKey, err := cache.MetaNamespaceKeyFunc(policy)
if err != nil {
logger.Error(err, "failed to compute policy key", "policy", policy)
} else {
c.policyState[webhookConfigurationName].Insert(policyKey)
}
c.policyState[webhookConfigurationName].Insert(policyKey)
}
}
@ -406,8 +407,8 @@ func (c *controller) reconcileMutatingWebhookConfiguration(ctx context.Context,
}
func (c *controller) updatePolicyStatuses(ctx context.Context) error {
c.lock.RLock()
defer c.lock.RUnlock()
c.lock.Lock()
defer c.lock.Unlock()
policies, err := c.getAllPolicies()
if err != nil {
return err
@ -446,7 +447,9 @@ func (c *controller) updatePolicyStatuses(ctx context.Context) error {
return updateStatusFunc(policy)
},
)
return err
if err != nil {
return err
}
} else {
_, err := controllerutils.UpdateStatus(
ctx,
@ -456,7 +459,9 @@ func (c *controller) updatePolicyStatuses(ctx context.Context) error {
return updateStatusFunc(policy)
},
)
return err
if err != nil {
return err
}
}
}
return nil

2
pkg/utils/controller/run.go
View file

@ -88,6 +88,6 @@ func reconcile(ctx context.Context, logger logr.Logger, obj interface{}, r recon
}
logger = logger.WithValues("key", k, "namespace", ns, "name", n)
logger.Info("reconciling ...")
defer logger.Info("done", "duration", time.Since(start))
defer logger.Info("done", "duration", time.Since(start).String())
return r(ctx, logger, k, ns, n)
}