fix: call deprovision only after the machine request status is deleted

Otherwise the infra provider stops the machine before Omni can run the reset and everything gets stuck when the machine is allocated into a cluster. Also fix labels not being reset on the machine status. Signed-off-by: Artem Chernyshev <[email protected]> (cherry picked from commit 3ef1f85)
siderolabs · Sep 17, 2024 · 89860d5 · 89860d5
1 parent 42218d0
commit 89860d5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/client/pkg/infra/controllers/provision.go b/client/pkg/infra/controllers/provision.go
@@ -277,17 +277,15 @@ func (ctrl *ProvisionController[T]) reconcileTearingDown(ctx context.Context, r
  return err
  }
 
- if err = ctrl.provisioner.Deprovision(ctx, logger, t, machineRequest); err != nil {
- return err
- }
-
  resources := []resource.Metadata{
  resource.NewMetadata(t.ResourceDefinition().DefaultNamespace, t.ResourceDefinition().Type, machineRequest.Metadata().ID(), resource.VersionUndefined),
  *infra.NewMachineRequestStatus(machineRequest.Metadata().ID()).Metadata(),
  }
 
  for _, md := range resources {
- ready, err := r.Teardown(ctx, md)
+ var ready bool
+
+ ready, err = r.Teardown(ctx, md)
  if err != nil {
  if state.IsNotFoundError(err) {
  continue
@@ -310,6 +308,10 @@ func (ctrl *ProvisionController[T]) reconcileTearingDown(ctx context.Context, r
  }
  }
 
+ if err = ctrl.provisioner.Deprovision(ctx, logger, t, machineRequest); err != nil {
+ return err
+ }
+
  logger.Info("machine deprovisioned", zap.String("request_id", machineRequest.Metadata().ID()))
 
  return r.RemoveFinalizer(ctx, machineRequest.Metadata(), ctrl.Name())

diff --git a/internal/backend/runtime/omni/controllers/omni/machine_status.go b/internal/backend/runtime/omni/controllers/omni/machine_status.go
@@ -536,6 +536,8 @@ func (ctrl *MachineStatusController) setClusterRelation(in inputs, machineStatus
  machineStatus.Metadata().Labels().Set(omni.MachineStatusLabelAvailable, "")
 
  machineStatus.Metadata().Labels().Delete(omni.LabelCluster)
+ machineStatus.Metadata().Labels().Delete(omni.LabelControlPlaneRole)
+ machineStatus.Metadata().Labels().Delete(omni.LabelWorkerRole)
 
  return nil
  }