Reconcile delete requests

Signed-off-by: Atanas Dinov <[email protected]>

config/rbac/role.yaml

@@ -106,6 +106,7 @@ rules:
   - plans
   verbs:
   - create
+  - delete
   - get
   - list
   - watch

internal/controller/upgradeplan_controller.go

@@ -38,6 +38,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/log"
@@ -57,9 +58,9 @@ type UpgradePlanReconciler struct {
 // +kubebuilder:rbac:groups=lifecycle.suse.com,resources=upgradeplans,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=lifecycle.suse.com,resources=upgradeplans/status,verbs=get;update;patch
 // +kubebuilder:rbac:groups=lifecycle.suse.com,resources=upgradeplans/finalizers,verbs=update
-// +kubebuilder:rbac:groups=upgrade.cattle.io,resources=plans,verbs=create;list;get;watch
+// +kubebuilder:rbac:groups=upgrade.cattle.io,resources=plans,verbs=create;list;get;watch;delete
 // +kubebuilder:rbac:groups="",resources=nodes,verbs=watch;list
-// +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;delete;create;watch
+// +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;delete;create;watch;delete
 // +kubebuilder:rbac:groups=core,resources=events,verbs=create;patch
 // +kubebuilder:rbac:groups=batch,resources=jobs,verbs=get;list;watch;create
 // +kubebuilder:rbac:groups=batch,resources=jobs/status,verbs=get
@@ -80,13 +81,72 @@ func (r *UpgradePlanReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	logger := log.FromContext(ctx)
 	logger.Info("Reconciling UpgradePlan")
 
-	result, err := r.executePlan(ctx, plan)
+	if !plan.ObjectMeta.DeletionTimestamp.IsZero() {
+		return ctrl.Result{}, r.reconcileDelete(ctx, plan)
+	} else if !controllerutil.ContainsFinalizer(plan, lifecyclev1alpha1.UpgradePlanFinalizer) {
+		controllerutil.AddFinalizer(plan, lifecyclev1alpha1.UpgradePlanFinalizer)
+		return ctrl.Result{}, r.Update(ctx, plan)
+	}
+
+	result, err := r.reconcileNormal(ctx, plan)
 
 	// Attempt to update the plan status before returning.
 	return result, errors.Join(err, r.Status().Update(ctx, plan))
 }
 
-func (r *UpgradePlanReconciler) executePlan(ctx context.Context, upgradePlan *lifecyclev1alpha1.UpgradePlan) (ctrl.Result, error) {
+func (r *UpgradePlanReconciler) reconcileDelete(ctx context.Context, upgradePlan *lifecyclev1alpha1.UpgradePlan) error {
+	if !controllerutil.ContainsFinalizer(upgradePlan, lifecyclev1alpha1.UpgradePlanFinalizer) {
+		return nil
+	}
+
+	sucPlans := &upgradecattlev1.PlanList{}
+
+	if err := r.List(ctx, sucPlans, &client.ListOptions{
+		Namespace: upgrade.SUCNamespace,
+	}); err != nil {
+		return fmt.Errorf("retrieving SUC plans: %w", err)
+	}
+
+	for _, plan := range sucPlans.Items {
+		if plan.Annotations[upgrade.PlanNameAnnotation] != upgradePlan.Name ||
+			plan.Annotations[upgrade.PlanNamespaceAnnotation] != upgradePlan.Namespace {
+			continue
+		}
+
+		if len(plan.Status.Applying) != 0 {
+			// Wait for the upgrade to be completed.
+			return nil
+		}
+
+		if err := r.Delete(ctx, &plan); err != nil {
+			return fmt.Errorf("deleting SUC plan %s: %w", plan.Name, err)
+		}
+	}
+
+	secrets := &corev1.SecretList{}
+
+	if err := r.List(ctx, secrets, &client.ListOptions{
+		Namespace: upgrade.SUCNamespace,
+	}); err != nil {
+		return fmt.Errorf("retrieving SUC secrets: %w", err)
+	}
+
+	for _, secret := range secrets.Items {
+		if secret.Annotations[upgrade.PlanNameAnnotation] != upgradePlan.Name ||
+			secret.Annotations[upgrade.PlanNamespaceAnnotation] != upgradePlan.Namespace {
+			continue
+		}
+
+		if err := r.Delete(ctx, &secret); err != nil {
+			return fmt.Errorf("deleting SUC secret %s: %w", secret.Name, err)
+		}
+	}
+
+	controllerutil.RemoveFinalizer(upgradePlan, lifecyclev1alpha1.UpgradePlanFinalizer)
+	return r.Update(ctx, upgradePlan)
+}
+
+func (r *UpgradePlanReconciler) reconcileNormal(ctx context.Context, upgradePlan *lifecyclev1alpha1.UpgradePlan) (ctrl.Result, error) {
 	release, err := r.retrieveReleaseManifest(ctx, upgradePlan)
 	if err != nil {
 		if !errors.Is(err, errReleaseManifestNotFound) {