From 91859950c00d11941163bc86f23fa9270cfe4ac6 Mon Sep 17 00:00:00 2001
From: Fabian Wiesel <fabian.wiesel@sap.com>
Date: Mon, 13 Jul 2026 14:59:04 +0200
Subject: [PATCH] Migrate HypervisorOffboardingReconciler to SSA status updates

Replace PatchHypervisorStatusWithRetry with Status().Apply() for the
ConditionTypeOffboarded condition. Seed only that condition so SSA
does not claim ownership over conditions written by other controllers.
---
 internal/controller/offboarding_controller.go | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/internal/controller/offboarding_controller.go b/internal/controller/offboarding_controller.go
index eee2cfe9..776aa932 100644
--- a/internal/controller/offboarding_controller.go
+++ b/internal/controller/offboarding_controller.go
@@ -29,11 +29,13 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	k8sacmetav1 "k8s.io/client-go/applyconfigurations/meta/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
 	logger "sigs.k8s.io/controller-runtime/pkg/log"
 
 	kvmv1 "github.com/cobaltcore-dev/openstack-hypervisor-operator/api/v1"
+	apiv1 "github.com/cobaltcore-dev/openstack-hypervisor-operator/applyconfigurations/api/v1"
 	"github.com/cobaltcore-dev/openstack-hypervisor-operator/internal/openstack"
 	"github.com/cobaltcore-dev/openstack-hypervisor-operator/internal/utils"
 )
@@ -157,15 +159,23 @@ func (r *HypervisorOffboardingReconciler) Reconcile(ctx context.Context, req ctr
 	return ctrl.Result{}, r.markOffboarded(ctx, hv)
 }
 
+func (r *HypervisorOffboardingReconciler) applyStatus(ctx context.Context, hv *kvmv1.Hypervisor, cond *k8sacmetav1.ConditionApplyConfiguration) error {
+	statusCfg := apiv1.HypervisorStatus()
+	if c := meta.FindStatusCondition(hv.Status.Conditions, kvmv1.ConditionTypeOffboarded); c != nil {
+		statusCfg.WithConditions(utils.ConditionFromStatus(*c))
+	}
+	utils.SetApplyConfigurationStatusCondition(&statusCfg.Conditions, *cond)
+	return r.Status().Apply(ctx,
+		apiv1.Hypervisor(hv.Name).WithStatus(statusCfg),
+		k8sclient.ForceOwnership, k8sclient.FieldOwner(OffboardingControllerName))
+}
+
 func (r *HypervisorOffboardingReconciler) setOffboardingCondition(ctx context.Context, hv *kvmv1.Hypervisor, message string) (ctrl.Result, error) {
-	err := utils.PatchHypervisorStatusWithRetry(ctx, r.Client, hv.Name, OffboardingControllerName, func(h *kvmv1.Hypervisor) {
-		meta.SetStatusCondition(&h.Status.Conditions, metav1.Condition{
-			Type:    kvmv1.ConditionTypeOffboarded,
-			Status:  metav1.ConditionFalse,
-			Reason:  "Offboarding",
-			Message: message,
-		})
-	})
+	err := r.applyStatus(ctx, hv, k8sacmetav1.Condition().
+		WithType(kvmv1.ConditionTypeOffboarded).
+		WithStatus(metav1.ConditionFalse).
+		WithReason("Offboarding").
+		WithMessage(message))
 	if err != nil {
 		return ctrl.Result{}, fmt.Errorf("cannot update hypervisor status due to %w", err)
 	}
@@ -173,14 +183,11 @@ func (r *HypervisorOffboardingReconciler) setOffboardingCondition(ctx context.Co
 }
 
 func (r *HypervisorOffboardingReconciler) markOffboarded(ctx context.Context, hv *kvmv1.Hypervisor) error {
-	err := utils.PatchHypervisorStatusWithRetry(ctx, r.Client, hv.Name, OffboardingControllerName, func(h *kvmv1.Hypervisor) {
-		meta.SetStatusCondition(&h.Status.Conditions, metav1.Condition{
-			Type:    kvmv1.ConditionTypeOffboarded,
-			Status:  metav1.ConditionTrue,
-			Reason:  "Offboarded",
-			Message: "Offboarding successful",
-		})
-	})
+	err := r.applyStatus(ctx, hv, k8sacmetav1.Condition().
+		WithType(kvmv1.ConditionTypeOffboarded).
+		WithStatus(metav1.ConditionTrue).
+		WithReason("Offboarded").
+		WithMessage("Offboarding successful"))
 	if err != nil {
 		return fmt.Errorf("cannot update hypervisor status due to %w", err)
 	}