VladPolskiy/mariadb-operator
1
0
Fork 0
mirror of https://github.com/mariadb-operator/mariadb-operator.git synced 2025-07-21 18:35:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reconcile updates after provisioning

Browse Source
This commit is contained in:
mmontes11
2024-10-21 20:01:40 +02:00
parent 5c4e09f1f7
commit e00b1d3b43
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/controller/mariadb_controller.go
View File

@ -177,6 +177,10 @@ func (r *MariaDBReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
Name: "Galera",
Reconcile: r.GaleraReconciler.Reconcile,
},
{
Name: "Update",
Reconcile: r.reconcileUpdates,
},
{
Name: "Restore",
Reconcile: r.reconcileRestore,
@ -339,14 +343,7 @@ func (r *MariaDBReconciler) reconcileStatefulSet(ctx context.Context, mariadb *m
}
shouldUpdate := mariadb.Spec.UpdateStrategy.Type != mariadbv1alpha1.NeverUpdateType
if err := r.StatefulSetReconciler.ReconcileWithUpdates(ctx, desiredSts, shouldUpdate); err != nil {
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
return ctrl.Result{}, r.StatefulSetReconciler.ReconcileWithUpdates(ctx, desiredSts, shouldUpdate)
}
func (r *MariaDBReconciler) reconcilePodLabels(ctx context.Context, mariadb *mariadbv1alpha1.MariaDB) (ctrl.Result, error) {