Skip to content

Commit

Permalink
add backward compatible code
Browse files Browse the repository at this point in the history
  • Loading branch information
bxy4543 committed Aug 27, 2024
1 parent 0d28569 commit df00421
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
10 changes: 3 additions & 7 deletions controllers/account/controllers/debt_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,11 @@ func (r *DebtReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
} else if client.IgnoreNotFound(err) != nil {
return ctrl.Result{}, fmt.Errorf("failed to get payment %s: %v", req.Name, err)
} else {
owner, err := r.getNamespaceOwner(req.NamespacedName.Name)
user, err := r.AccountV2.GetUser(&pkgtypes.UserQueryOpts{Owner: req.NamespacedName.Name})
if err != nil {
return ctrl.Result{}, err
return ctrl.Result{}, fmt.Errorf("failed to get user %s: %v", req.NamespacedName.Name, err)
}
user, err := r.AccountV2.GetUser(&pkgtypes.UserQueryOpts{Owner: owner})
if err != nil {
return ctrl.Result{}, fmt.Errorf("failed to get user %s: %v", owner, err)
}
reconcileErr = r.reconcile(ctx, owner, user.ID)
reconcileErr = r.reconcile(ctx, req.NamespacedName.Name, user.ID)
}
if reconcileErr != nil {
if reconcileErr == ErrAccountNotExist {
Expand Down
2 changes: 1 addition & 1 deletion controllers/account/controllers/payment_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ func (r *PaymentReconciler) reconcileNewPayment(payment *accountv1.Payment) erro
}
payment.Spec.UserID = user.ID
}
if err := r.Create(context.Background(), payment); err != nil {
if err := r.Update(context.Background(), payment); err != nil {
return fmt.Errorf("create payment failed: %w", err)
}
// get user ID
Expand Down

0 comments on commit df00421

Please sign in to comment.