Always evict, if there is even a chance of a VM

Author: fwiesel

internal/controller/decomission_controller.go

@@ -78,7 +78,15 @@ func (r *NodeDecommissionReconciler) Reconcile(ctx context.Context, req ctrl.Req
 		return ctrl.Result{}, nil
 	}
 
-	if !meta.IsStatusConditionFalse(hv.Status.Conditions, kvmv1.ConditionTypeEvicting) {
+	// Onboarding-condition needs to be either unset or set to false, so that we can continue
+	// The first means, onboarding has never started, the second means it has been aborted or finished
+	if meta.IsStatusConditionTrue(hv.Status.Conditions, kvmv1.ConditionTypeOnboarding) {
+		return ctrl.Result{}, nil
+	}
+
+	// If the service id is set, there might be VMs either from onboarding or even from normal operation
+	// In that case we need to wait until those are evicted
+	if hv.Status.ServiceID != "" && !meta.IsStatusConditionFalse(hv.Status.Conditions, kvmv1.ConditionTypeEvicting) {
 		// Either has not evicted yet, or is still evicting VMs, so we have to wait for that to finish
 		return ctrl.Result{}, nil
 	}

internal/controller/hypervisor_maintenance_controller.go

@@ -54,21 +54,17 @@ type HypervisorMaintenanceController struct {
 // +kubebuilder:rbac:groups=kvm.cloud.sap,resources=hypervisors,verbs=get;list;watch
 // +kubebuilder:rbac:groups=kvm.cloud.sap,resources=hypervisors/status,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=kvm.cloud.sap,resources=evictions,verbs=get;list;watch;create;update;patch;delete
-
 func (hec *HypervisorMaintenanceController) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	hv := &kvmv1.Hypervisor{}
 	if err := hec.Get(ctx, req.NamespacedName, hv); err != nil {
 		// OnboardingReconciler not found errors, could be deleted
 		return ctrl.Result{}, k8sclient.IgnoreNotFound(err)
 	}
 
-	// is onboarding completed?
-	if !meta.IsStatusConditionFalse(hv.Status.Conditions, kvmv1.ConditionTypeOnboarding) {
-		return ctrl.Result{}, nil
-	}
-
-	// ensure serviceId is set
-	if hv.Status.ServiceID == "" {
+	// If onboarding hasn't even started, no value will be set
+	// If it has been started, but not finished yet, we need to wait for it to be aborted
+	// So we can continue, if the condition is either not set at all or false
+	if meta.IsStatusConditionTrue(hv.Status.Conditions, kvmv1.ConditionTypeOnboarding) {
 		return ctrl.Result{}, nil
 	}
 
@@ -94,6 +90,12 @@ func (hec *HypervisorMaintenanceController) reconcileComputeService(ctx context.
 	log := logger.FromContext(ctx)
 	serviceId := hv.Status.ServiceID
 
+	// We can only do something here, if there is a service to begin with.
+	// The onboarding should take care of that
+	if serviceId == "" {
+		return nil
+	}
+
 	switch hv.Spec.Maintenance {
 	case kvmv1.MaintenanceUnset:
 		// Enable the compute service (in case we haven't done so already)