Skip to content

fix: don't ignore not found error in its controller #9823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cjc7373 merged 4 commits into from
Dec 31, 2025
Merged

fix: don't ignore not found error in its controller #9823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f72d93d
fix: don't ignore not found error in its controller
cjc7373 Oct 21, 2025
bc72205
more detailed error
cjc7373 Oct 21, 2025
2cfad73
review comments
cjc7373 Nov 3, 2025
7cc2685
Merge remote-tracking branch 'origin/main' into bugfix/its-do-not-fil…
cjc7373 Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/controller/kubebuilderx/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ func (c *controller) emitFailureEvent() {
return
}
// TODO(free6om): make error message user-friendly
c.tree.EventRecorder.Eventf(c.tree.GetRoot(), corev1.EventTypeWarning, "FailedReconcile", "reconcile failed: %s", c.err.Error())
c.tree.EventRecorder.Eventf(c.tree.GetRoot(), corev1.EventTypeWarning, "FailedReconcile", "%s", c.err.Error())
}

func NewController(ctx context.Context, cli client.Client, req ctrl.Request, recorder record.EventRecorder, logger logr.Logger) Controller {
Expand Down
25 changes: 12 additions & 13 deletions pkg/controller/kubebuilderx/plan_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import (
corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
"k8s.io/apimachinery/pkg/api/equality"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/client-go/tools/record"
"k8s.io/klog/v2"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

Expand Down Expand Up @@ -264,8 +264,8 @@ func (b *PlanBuilder) defaultWalkFunc(v graph.Vertex) error {

func (b *PlanBuilder) createObject(ctx context.Context, vertex *model.ObjectVertex) error {
err := b.cli.Create(ctx, vertex.Obj, clientOption(vertex))
if err != nil && !apierrors.IsAlreadyExists(err) {
return err
if err != nil {
return fmt.Errorf("create %T %s failed: %w", vertex.Obj, klog.KObj(vertex.Obj), err)
}
b.emitEvent(vertex.Obj, "SuccessfulCreate", model.CREATE)
return nil
Expand All @@ -281,8 +281,8 @@ func (b *PlanBuilder) updateObject(ctx context.Context, vertex *model.ObjectVert
err = b.cli.Update(ctx, vertex.Obj, clientOption(vertex))
reason = "SuccessfulUpdate"
}
if err != nil && !apierrors.IsNotFound(err) {
return err
if err != nil {
return fmt.Errorf("update %T %s failed: %w", vertex.Obj, klog.KObj(vertex.Obj), err)
}
b.emitEvent(vertex.Obj, reason, model.UPDATE)
return nil
Expand All @@ -299,8 +299,8 @@ func (b *PlanBuilder) patchObject(ctx context.Context, vertex *model.ObjectVerte
err = b.cli.Patch(ctx, vertex.Obj, patch, clientOption(vertex))
reason = "SuccessfulPatch"
}
if err != nil && !apierrors.IsNotFound(err) {
return err
if err != nil {
return fmt.Errorf("patch %T %s failed: %w", vertex.Obj, klog.KObj(vertex.Obj), err)
}
b.emitEvent(vertex.Obj, reason, model.PATCH)
return nil
Expand All @@ -313,15 +313,14 @@ func (b *PlanBuilder) deleteObject(ctx context.Context, vertex *model.ObjectVert
}
if len(finalizer) > 0 && controllerutil.RemoveFinalizer(vertex.Obj, finalizer) {
err := b.cli.Update(ctx, vertex.Obj, clientOption(vertex))
if err != nil && !apierrors.IsNotFound(err) {
b.transCtx.logger.Error(err, fmt.Sprintf("delete %T error: %s", vertex.Obj, vertex.Obj.GetName()))
return err
if err != nil {
return fmt.Errorf("delete %T %s failed: %w", vertex.Obj, klog.KObj(vertex.Obj), err)
}
}
if !model.IsObjectDeleting(vertex.Obj) {
err := b.cli.Delete(ctx, vertex.Obj, clientOption(vertex))
if err != nil && !apierrors.IsNotFound(err) {
return err
if err != nil {
return fmt.Errorf("delete %T %s failed: %w", vertex.Obj, klog.KObj(vertex.Obj), err)
}
b.emitEvent(vertex.Obj, "SuccessfulDelete", model.DELETE)
}
Expand All @@ -330,7 +329,7 @@ func (b *PlanBuilder) deleteObject(ctx context.Context, vertex *model.ObjectVert

func (b *PlanBuilder) statusObject(ctx context.Context, vertex *model.ObjectVertex) error {
if err := b.cli.Status().Update(ctx, vertex.Obj, clientOption(vertex)); err != nil {
return err
return fmt.Errorf("status %T %s failed: %w", vertex.Obj, klog.KObj(vertex.Obj), err)
}
return nil
}
Expand Down