Skip to content

Commit

Permalink
Merge pull request #564 from karlkfi/karl-dep-uid
Browse files Browse the repository at this point in the history
fix: Avoid logging UID error for skipped apply
  • Loading branch information
k8s-ci-robot authored Mar 6, 2022
2 parents 9caf882 + 98d3504 commit 010f57a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkg/apply/taskrunner/task.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,16 +152,16 @@ 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 {
// Object never applied or deleted!
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 {
Expand Down

0 comments on commit 010f57a

Please sign in to comment.