Onboarding: Cleanup also when we need to abort

The spec can disable the life-cycle or we can get a terminating
condition, even while we are testing.
We better clean up the test instances then too.

Author: fwiesel

internal/controller/onboarding_controller.go

@@ -53,6 +53,7 @@ var errRequeue = errors.New("requeue requested")
 const (
 	defaultWaitTime           = 1 * time.Minute
 	ConditionTypeOnboarding   = "Onboarding"
+	ConditionReasonAborted    = "aborted"
 	ConditionReasonInitial    = "initial"
 	ConditionReasonOnboarding = "onboarding"
 	ConditionReasonTesting    = "testing"
@@ -87,17 +88,18 @@ func (r *OnboardingController) Reconcile(ctx context.Context, req ctrl.Request)
 		return ctrl.Result{}, k8sclient.IgnoreNotFound(err)
 	}
 
+	computeHost := hv.Name
+
 	// check if lifecycle management is enabled
 	if !hv.Spec.LifecycleEnabled {
-		return ctrl.Result{}, nil
+		return r.abortOnboarding(ctx, hv, computeHost)
 	}
 
 	// check if hv is terminating
 	if meta.IsStatusConditionTrue(hv.Status.Conditions, kvmv1.ConditionTypeTerminating) {
-		return ctrl.Result{}, nil
+		return r.abortOnboarding(ctx, hv, computeHost)
 	}
 
-	computeHost := hv.Name
 	// We bail here out, because the openstack api is not the best to poll
 	if hv.Status.HypervisorID == "" || hv.Status.ServiceID == "" {
 		if err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
@@ -144,6 +146,34 @@ func (r *OnboardingController) Reconcile(ctx context.Context, req ctrl.Request)
 	}
 }
 
+func (r *OnboardingController) abortOnboarding(ctx context.Context, hv *kvmv1.Hypervisor, computeHost string) (ctrl.Result, error) {
+	status := meta.FindStatusCondition(hv.Status.Conditions, ConditionTypeOnboarding)
+	// Never onboarded
+	if status == nil {
+		return ctrl.Result{}, nil
+	}
+
+	changed := meta.SetStatusCondition(&hv.Status.Conditions, metav1.Condition{
+		Type:    kvmv1.ConditionTypeReady,
+		Status:  metav1.ConditionFalse,
+		Reason:  ConditionReasonOnboarding,
+		Message: "Onboarding aborted",
+	}) || meta.SetStatusCondition(&hv.Status.Conditions, metav1.Condition{
+		Type:    ConditionTypeOnboarding,
+		Status:  metav1.ConditionTrue,
+		Reason:  ConditionReasonAborted,
+		Message: "Aborted due to LivecycleEnabled being false",
+	})
+	if !changed {
+		// Already aborted
+		return ctrl.Result{}, nil
+	}
+	if err := r.deleteTestServers(ctx, computeHost); err != nil {
+		return ctrl.Result{}, err
+	}
+	return ctrl.Result{}, r.Status().Update(ctx, hv)
+}
+
 func (r *OnboardingController) initialOnboarding(ctx context.Context, hv *kvmv1.Hypervisor, host string) error {
 	zone, found := hv.Labels[corev1.LabelTopologyZone]
 	if !found || zone == "" {