Skip to content

Commit

Permalink
avoid error status accumulation when failing to fetch hub channel (#408
Browse files Browse the repository at this point in the history
…) (#1122) (#1124)

(cherry picked from commit 90b7a75)

Co-authored-by: magic-mirror-bot[bot] <107957005+magic-mirror-bot[bot]@users.noreply.github.com>
  • Loading branch information
xiangjingli and magic-mirror-bot[bot] authored Jul 30, 2024
1 parent 05bed67 commit c97cc9f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkg/controller/subscription/subscription_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ func (r *ReconcileSubscription) doReconcile(instance *appv1.Subscription) error

err = r.hubclient.Get(context.TODO(), chnkey, subitem.Channel)
if err != nil {
return gerr.Wrapf(err, "failed to get channel of subscription %v", instance)
return gerr.Wrap(err, "failed to get channel")
}
}

Expand All @@ -351,7 +351,7 @@ func (r *ReconcileSubscription) doReconcile(instance *appv1.Subscription) error

err = r.hubclient.Get(context.TODO(), scndChnkey, subitem.SecondaryChannel)
if err != nil {
return gerr.Wrapf(err, "failed to get the secondary channel of subscription %v", instance)
return gerr.Wrap(err, "failed to get the secondary channel")
}
}
}
Expand Down

0 comments on commit c97cc9f

Please sign in to comment.