Skip to content

Commit 010f57a

Browse files
authored
Merge pull request #564 from karlkfi/karl-dep-uid
fix: Avoid logging UID error for skipped apply
2 parents 9caf882 + 98d3504 commit 010f57a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

pkg/apply/taskrunner/task.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,16 +152,16 @@ func (w *WaitTask) startInner(taskContext *TaskContext) {
152152
pending := object.ObjMetadataSet{}
153153
for _, id := range w.Ids {
154154
switch {
155-
case w.changedUID(taskContext, id):
156-
// replaced
157-
w.handleChangedUID(taskContext, id)
158155
case w.skipped(taskContext, id):
159156
err := taskContext.InventoryManager().SetSkippedReconcile(id)
160157
if err != nil {
161158
// Object never applied or deleted!
162159
klog.Errorf("Failed to mark object as skipped reconcile: %v", err)
163160
}
164161
w.sendEvent(taskContext, id, event.ReconcileSkipped)
162+
case w.changedUID(taskContext, id):
163+
// replaced
164+
w.handleChangedUID(taskContext, id)
165165
case w.reconciledByID(taskContext, id):
166166
err := taskContext.InventoryManager().SetSuccessfulReconcile(id)
167167
if err != nil {

0 commit comments

Comments
 (0)