@@ -33,6 +33,7 @@ import (
3333 "sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/openstack/services/provider"
3434 "sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/openstack/services/userdata"
3535 "sigs.k8s.io/cluster-api/api/v1alpha2"
36+ "sigs.k8s.io/cluster-api/util/patch"
3637 "sigs.k8s.io/controller-runtime/pkg/log"
3738 "sigs.k8s.io/controller-runtime/pkg/reconcile"
3839 "strconv"
@@ -44,8 +45,8 @@ import (
4445
4546 apierrors "k8s.io/apimachinery/pkg/api/errors"
4647 infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha2"
47- capierrors "sigs.k8s.io/cluster-api/pkg/ errors"
48- "sigs.k8s.io/cluster-api/pkg/ util"
48+ capierrors "sigs.k8s.io/cluster-api/errors"
49+ "sigs.k8s.io/cluster-api/util"
4950)
5051
5152const (
@@ -67,7 +68,7 @@ type OpenStackMachineReconciler struct {
6768// +kubebuilder:rbac:groups=cluster.x-k8s.io,resources=clusters;machines,verbs=get;list;watch
6869// +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch;create;update;patch
6970
70- func (r * OpenStackMachineReconciler ) Reconcile (request ctrl.Request ) (ctrl.Result , error ) {
71+ func (r * OpenStackMachineReconciler ) Reconcile (request ctrl.Request ) (_ ctrl.Result , reterr error ) {
7172 ctx := context .TODO ()
7273 logger := log .Log .
7374 WithName (machineControllerName ).
@@ -119,6 +120,20 @@ func (r *OpenStackMachineReconciler) Reconcile(request ctrl.Request) (ctrl.Resul
119120
120121 logger = logger .WithName (fmt .Sprintf ("openStackCluster=%s" , openStackCluster .Name ))
121122
123+ // Initialize the patch helper
124+ patchHelper , err := patch .NewHelper (openStackMachine , r )
125+ if err != nil {
126+ return ctrl.Result {}, err
127+ }
128+ // Always attempt to Patch the Machine object and status after each reconciliation.
129+ defer func () {
130+ if err := patchHelper .Patch (ctx , openStackMachine ); err != nil {
131+ if reterr == nil {
132+ reterr = err
133+ }
134+ }
135+ }()
136+
122137 // Handle deleted clusters
123138 if ! openStackMachine .DeletionTimestamp .IsZero () {
124139 return r .reconcileMachineDelete (logger , machine , openStackMachine , cluster , openStackCluster )
@@ -156,8 +171,6 @@ func (r *OpenStackMachineReconciler) reconcileMachine(logger logr.Logger, machin
156171
157172 clusterName := fmt .Sprintf ("%s-%s" , cluster .ObjectMeta .Namespace , cluster .Name )
158173
159- openstackMachinePatch := client .MergeFrom (openStackMachine .DeepCopy ())
160-
161174 osProviderClient , clientOpts , err := provider .NewClientFromMachine (r .Client , openStackMachine )
162175 if err != nil {
163176 return reconcile.Result {}, err
@@ -173,12 +186,6 @@ func (r *OpenStackMachineReconciler) reconcileMachine(logger logr.Logger, machin
173186 return reconcile.Result {}, err
174187 }
175188
176- defer func () {
177- if err := storeMachine (r .Client , openStackMachine , openstackMachinePatch ); err != nil && reterr == nil {
178- reterr = err
179- }
180- }()
181-
182189 instance , err := r .getOrCreate (computeService , machine , openStackMachine , cluster , openStackCluster )
183190 if err != nil {
184191 handleMachineError (openStackMachine , capierrors .UpdateMachineError , errors .Errorf ("OpenStack instance cannot be created: %v" , err ))
@@ -334,22 +341,6 @@ func getTimeout(name string, timeout int) time.Duration {
334341 return time .Duration (timeout )
335342}
336343
337- func storeMachine (ctrlClient client.Client , openStackMachine * infrav1.OpenStackMachine , openStackMachinePatch client.Patch ) error {
338- ctx := context .TODO ()
339-
340- // Patch Cluster object.
341- if err := ctrlClient .Patch (ctx , openStackMachine , openStackMachinePatch ); err != nil {
342- return errors .Wrapf (err , "error patching OpenStackMachine %s/%s" , openStackMachine .Namespace , openStackMachine .Name )
343- }
344-
345- // Patch Cluster status.
346- if err := ctrlClient .Status ().Patch (ctx , openStackMachine , openStackMachinePatch ); err != nil {
347- return errors .Wrapf (err , "error patching OpenStackMachine %s/%s status" , openStackMachine .Namespace , openStackMachine .Name )
348- }
349-
350- return nil
351- }
352-
353344func (r * OpenStackMachineReconciler ) SetupWithManager (mgr ctrl.Manager ) error {
354345 return ctrl .NewControllerManagedBy (mgr ).
355346 For (& infrav1.OpenStackMachine {}).
0 commit comments