From 98d3504e3dcd7957bf955f078505b9fa7b21e2d5 Mon Sep 17 00:00:00 2001 From: Karl Isenberg Date: Sat, 5 Mar 2022 16:12:20 -0800 Subject: [PATCH] fix: Avoid logging UID error for skipped apply --- pkg/apply/taskrunner/task.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/apply/taskrunner/task.go b/pkg/apply/taskrunner/task.go index 3f887e09..1555c508 100644 --- a/pkg/apply/taskrunner/task.go +++ b/pkg/apply/taskrunner/task.go @@ -152,9 +152,6 @@ func (w *WaitTask) startInner(taskContext *TaskContext) { pending := object.ObjMetadataSet{} for _, id := range w.Ids { switch { - case w.changedUID(taskContext, id): - // replaced - w.handleChangedUID(taskContext, id) case w.skipped(taskContext, id): err := taskContext.InventoryManager().SetSkippedReconcile(id) if err != nil { @@ -162,6 +159,9 @@ func (w *WaitTask) startInner(taskContext *TaskContext) { klog.Errorf("Failed to mark object as skipped reconcile: %v", err) } w.sendEvent(taskContext, id, event.ReconcileSkipped) + case w.changedUID(taskContext, id): + // replaced + w.handleChangedUID(taskContext, id) case w.reconciledByID(taskContext, id): err := taskContext.InventoryManager().SetSuccessfulReconcile(id) if err != nil {