Skip to content

Commit

Permalink
fix(controller): give precedence to user defined plan template
Browse files Browse the repository at this point in the history
  • Loading branch information
nettoclaudio committed Jan 25, 2022
1 parent 3791620 commit f2cfeb1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion controllers/rpaasinstance_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func (r *RpaasInstanceReconciler) Reconcile(ctx context.Context, req ctrl.Reques
}

if instance.Spec.PlanTemplate != nil {
plan.Spec, err = mergePlans(plan.Spec, *instance.Spec.PlanTemplate)
plan.Spec, err = mergePlans(*instance.Spec.PlanTemplate, plan.Spec)
if err != nil {
return reconcile.Result{}, err
}
Expand Down

0 comments on commit f2cfeb1

Please sign in to comment.