controller: change merge flavor and plan to proper order

tsuru · Feb 19, 2024 · 6e3ae69 · 6e3ae69
1 parent fe8348d
commit 6e3ae69
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/controllers/rpaasinstance_controller.go b/controllers/rpaasinstance_controller.go
@@ -81,18 +81,18 @@ func (r *RpaasInstanceReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		return reconcile.Result{}, err
 	}
 
-	if instance.Spec.PlanTemplate != nil {
-		plan.Spec, err = mergePlans(plan.Spec, *instance.Spec.PlanTemplate)
-		if err != nil {
-			return reconcile.Result{}, err
-		}
-	}
-
 	instanceMergedWithFlavors, err := r.mergeWithFlavors(ctx, instance.DeepCopy())
 	if err != nil {
 		return reconcile.Result{}, nil
 	}
 
+	if instanceMergedWithFlavors.Spec.PlanTemplate != nil {
+		plan.Spec, err = mergePlans(plan.Spec, *instanceMergedWithFlavors.Spec.PlanTemplate)
+		if err != nil {
+			return reconcile.Result{}, err
+		}
+	}
+
 	if err = certificates.ReconcileDynamicCertificates(ctx, r.Client, instance, instanceMergedWithFlavors); err != nil {
 		return reconcile.Result{}, err
 	}