Skip to content

🐛Remove waitingForServer loop to allow controller to move forward and do further checks #2726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −9
Open

🐛Remove waitingForServer loop to allow controller to move forward and do further checks #2726

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions controllers/openstackmachine_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line 377, if server isn't ready, InstanceID might be nil, causing panic

return ctrl.Result{}, err
}

Expand Down Expand Up @@ -572,21 +572,18 @@ 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 {
// If an error occurs while getting or creating the OpenStackServer,
// 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.
Expand Down