mirror of
https://github.com/mariadb-operator/mariadb-operator.git
synced 2025-07-22 18:27:44 +00:00
Reconcile updates after provisioning
This commit is contained in:
@ -177,6 +177,10 @@ func (r *MariaDBReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
|
|||||||
Name: "Galera",
|
Name: "Galera",
|
||||||
Reconcile: r.GaleraReconciler.Reconcile,
|
Reconcile: r.GaleraReconciler.Reconcile,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
Name: "Update",
|
||||||
|
Reconcile: r.reconcileUpdates,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
Name: "Restore",
|
Name: "Restore",
|
||||||
Reconcile: r.reconcileRestore,
|
Reconcile: r.reconcileRestore,
|
||||||
@ -339,14 +343,7 @@ func (r *MariaDBReconciler) reconcileStatefulSet(ctx context.Context, mariadb *m
|
|||||||
}
|
}
|
||||||
shouldUpdate := mariadb.Spec.UpdateStrategy.Type != mariadbv1alpha1.NeverUpdateType
|
shouldUpdate := mariadb.Spec.UpdateStrategy.Type != mariadbv1alpha1.NeverUpdateType
|
||||||
|
|
||||||
if err := r.StatefulSetReconciler.ReconcileWithUpdates(ctx, desiredSts, shouldUpdate); err != nil {
|
return ctrl.Result{}, r.StatefulSetReconciler.ReconcileWithUpdates(ctx, desiredSts, shouldUpdate)
|
||||||
return ctrl.Result{}, fmt.Errorf("error reconciling StatefulSet: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if result, err := r.reconcileUpdates(ctx, mariadb); !result.IsZero() || err != nil {
|
|
||||||
return result, err
|
|
||||||
}
|
|
||||||
return ctrl.Result{}, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *MariaDBReconciler) reconcilePodLabels(ctx context.Context, mariadb *mariadbv1alpha1.MariaDB) (ctrl.Result, error) {
|
func (r *MariaDBReconciler) reconcilePodLabels(ctx context.Context, mariadb *mariadbv1alpha1.MariaDB) (ctrl.Result, error) {
|
||||||
|
Reference in New Issue
Block a user