mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-05 07:26:55 +00:00
Code Activity

fix: update explicit webhook based on the policy type (#11580) (#11581)

Browse source 
Signed-off-by: ShutingZhao <shuting@nirmata.com>
Co-authored-by: shuting <shuting@nirmata.com>
Co-authored-by: Jim Bugwadia <jim@nirmata.com>
This commit is contained in:
gcp-cherry-pick-bot[bot] 2024-11-15 07:14:53 +00:00 • committed by GitHub
parent 1328364c13
commit 8fccb9107f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -525,7 +525,7 @@ func (c *controller) isGlobalContextEntryReady(name string, gctxentries []*kyver
return false
}
func (c *controller) updatePolicyStatuses(ctx context.Context) error {
func (c *controller) updatePolicyStatuses(ctx context.Context, webhookType string) error {
c.lock.Lock()
defer c.lock.Unlock()
policies, err := c.getAllPolicies()
@ -543,10 +543,9 @@ func (c *controller) updatePolicyStatuses(ctx context.Context) error {
}
ready, message := true, "Ready"
if c.autoUpdateWebhooks {
for _, set := range c.policyState {
if set, ok := c.policyState[webhookType]; ok {
if !set.Has(policyKey) {
ready, message = false, "Not Ready"
break
}
}
}
@ -667,7 +666,7 @@ func (c *controller) reconcile(ctx context.Context, logger logr.Logger, key, nam
if err := c.reconcileResourceMutatingWebhookConfiguration(ctx); err != nil {
return err
}
if err := c.updatePolicyStatuses(ctx); err != nil {
if err := c.updatePolicyStatuses(ctx, config.MutatingWebhookConfigurationName); err != nil {
return err
}
}
@ -678,7 +677,7 @@ func (c *controller) reconcile(ctx context.Context, logger logr.Logger, key, nam
if err := c.reconcileResourceValidatingWebhookConfiguration(ctx); err != nil {
return err
}
if err := c.updatePolicyStatuses(ctx); err != nil {
if err := c.updatePolicyStatuses(ctx, config.ValidatingWebhookConfigurationName); err != nil {
return err
}
}