mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-24 08:36:46 +00:00
Code Activity

chore: improve error handling (#12376)

Browse source 
Signed-off-by: ShutingZhao <shuting@nirmata.com>
This commit is contained in:
shuting 2025-03-11 20:52:04 +08:00 • committed by GitHub
parent aea1ea8c3d
commit b5b1287282
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pkg/controllers/validatingadmissionpolicy-generate/controller.go
View file

@ -2,6 +2,7 @@ package validatingadmissionpolicygenerate
import (
"context"
"fmt"
"strings"
"time"
@ -426,8 +427,7 @@ func (c *controller) reconcile(ctx context.Context, logger logr.Logger, key, nam
if vapErr != nil {
if !apierrors.IsNotFound(vapErr) {
c.updatePolicyStatus(ctx, policy, false, vapErr.Error())
return vapErr
return fmt.Errorf("failed to get validatingadmissionpolicy %s: %v", vapName, vapErr)
}
observedVAP = &admissionregistrationv1.ValidatingAdmissionPolicy{
ObjectMeta: metav1.ObjectMeta{
@ -437,8 +437,7 @@ func (c *controller) reconcile(ctx context.Context, logger logr.Logger, key, nam
}
if vapBindingErr != nil {
if !apierrors.IsNotFound(vapBindingErr) {
c.updatePolicyStatus(ctx, policy, false, vapBindingErr.Error())
return vapBindingErr
return fmt.Errorf("failed to get validatingadmissionpolicybinding %s: %v", vapBindingName, vapBindingErr)
}
observedVAPbinding = &admissionregistrationv1.ValidatingAdmissionPolicyBinding{
ObjectMeta: metav1.ObjectMeta{
@ -449,7 +448,7 @@ func (c *controller) reconcile(ctx context.Context, logger logr.Logger, key, nam
celexceptions, err := c.getCELExceptions(name)
if err != nil {
return err
return fmt.Errorf("failed to get celexceptions by name %s: %v", name, err)
}
for _, exception := range celexceptions {
genericExceptions = append(genericExceptions, engineapi.NewCELPolicyException(&exception))
@ -458,13 +457,11 @@ func (c *controller) reconcile(ctx context.Context, logger logr.Logger, key, nam
if observedVAP.ResourceVersion == "" {
err := admissionpolicy.BuildValidatingAdmissionPolicy(c.discoveryClient, observedVAP, policy, genericExceptions)
if err != nil {
c.updatePolicyStatus(ctx, policy, false, err.Error())
return err
return fmt.Errorf("failed to build validatingadmissionpolicy %s: %v", observedVAP.GetName(), err)
}
_, err = c.client.AdmissionregistrationV1().ValidatingAdmissionPolicies().Create(ctx, observedVAP, metav1.CreateOptions{})
if err != nil {
c.updatePolicyStatus(ctx, policy, false, err.Error())
return err
return fmt.Errorf("failed to create validatingadmissionpolicy %s: %v", observedVAP.GetName(), err)
}
} else {
_, err := controllerutils.Update(
@ -475,21 +472,18 @@ func (c *controller) reconcile(ctx context.Context, logger logr.Logger, key, nam
return admissionpolicy.BuildValidatingAdmissionPolicy(c.discoveryClient, observed, policy, genericExceptions)
})
if err != nil {
c.updatePolicyStatus(ctx, policy, false, err.Error())
return err
return fmt.Errorf("failed to update validatingadmissionpolicy %s: %v", observedVAP.GetName(), err)
}
}
if observedVAPbinding.ResourceVersion == "" {
err := admissionpolicy.BuildValidatingAdmissionPolicyBinding(observedVAPbinding, policy)
if err != nil {
c.updatePolicyStatus(ctx, policy, false, err.Error())
return err
return fmt.Errorf("failed to build validatingadmissionpolicybinding %s: %v", observedVAPbinding.GetName(), err)
}
_, err = c.client.AdmissionregistrationV1().ValidatingAdmissionPolicyBindings().Create(ctx, observedVAPbinding, metav1.CreateOptions{})
if err != nil {
c.updatePolicyStatus(ctx, policy, false, err.Error())
return err
return fmt.Errorf("failed to create validatingadmissionpolicybinding %s: %v", observedVAPbinding.GetName(), err)
}
} else {
_, err := controllerutils.Update(
@ -500,8 +494,7 @@ func (c *controller) reconcile(ctx context.Context, logger logr.Logger, key, nam
return admissionpolicy.BuildValidatingAdmissionPolicyBinding(observed, policy)
})
if err != nil {
c.updatePolicyStatus(ctx, policy, false, err.Error())
return err
return fmt.Errorf("failed to update validatingadmissionpolicybinding %s: %v", observedVAPbinding.GetName(), err)
}
}