From 3a7eaa350ca2c8f1bef7243c6302e56c9022ec2c Mon Sep 17 00:00:00 2001 From: smoshiur1237 Date: Sun, 21 Sep 2025 22:38:21 +0300 Subject: [PATCH] Remove openstack server loop to allow controller to move forward Signed-off-by: smoshiur1237 --- controllers/openstackmachine_controller.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/controllers/openstackmachine_controller.go b/controllers/openstackmachine_controller.go index 51e1c91d53..d14a704939 100644 --- a/controllers/openstackmachine_controller.go +++ b/controllers/openstackmachine_controller.go @@ -361,8 +361,8 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, scope scope.Logger().Info("Reconciling Machine") - machineServer, waitingForServer, err := r.reconcileMachineServer(ctx, scope, openStackMachine, openStackCluster, machine) - if err != nil || waitingForServer { + machineServer, err := r.reconcileMachineServer(ctx, scope, openStackMachine, openStackCluster, machine) + if err != nil { return ctrl.Result{}, err } @@ -572,7 +572,7 @@ func openStackMachineSpecToOpenStackServerSpec(openStackMachineSpec *infrav1.Ope // reconcileMachineServer reconciles the OpenStackServer object for the OpenStackMachine. // It returns the OpenStackServer object and a boolean indicating if the OpenStackServer is ready. -func (r *OpenStackMachineReconciler) reconcileMachineServer(ctx context.Context, scope *scope.WithLogger, openStackMachine *infrav1.OpenStackMachine, openStackCluster *infrav1.OpenStackCluster, machine *clusterv1.Machine) (*infrav1alpha1.OpenStackServer, bool, error) { +func (r *OpenStackMachineReconciler) reconcileMachineServer(ctx context.Context, scope *scope.WithLogger, openStackMachine *infrav1.OpenStackMachine, openStackCluster *infrav1.OpenStackCluster, machine *clusterv1.Machine) (*infrav1alpha1.OpenStackServer, error) { var server *infrav1alpha1.OpenStackServer server, err := r.getOrCreateMachineServer(ctx, openStackCluster, openStackMachine, machine) if err != nil { @@ -580,13 +580,10 @@ func (r *OpenStackMachineReconciler) reconcileMachineServer(ctx context.Context, // we won't requeue the request so reconcileNormal can add conditions to the OpenStackMachine // and we can see the error in the logs. scope.Logger().Error(err, "Failed to get or create OpenStackServer") - return server, false, err - } - if !server.Status.Ready { - scope.Logger().Info("Waiting for OpenStackServer to be ready", "name", server.Name) - return server, true, nil + return server, err } - return server, false, nil + + return server, nil } // getOrCreateMachineServer gets or creates the OpenStackServer object for the OpenStackMachine.