update functions used by initialize

Arvind Thirumurugan · Arvind Thirumurugan · commit 7abbf8c8c9c3 · 2025-10-02T15:07:19.000-07:00
Signed-off-by: Arvind Thirumurugan &lt;arvindth@microsoft.com&gt;
diff --git a/.github/.copilot/breadcrumbs/2025-09-25-1430-initialize-refactor.md b/.github/.copilot/breadcrumbs/2025-09-25-1430-initialize-refactor.md
diff --git a/pkg/controllers/placement/controller.go b/pkg/controllers/placement/controller.go
@@ -72,7 +72,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, key controller.QueueKey) (ct
 		klog.V(2).InfoS("Placement reconciliation ends", "placementKey", placementKey, "latency", latency)
 	}()
 
-	placementObj, err := controller.FetchPlacementFromKey(ctx, r.Client, queue.PlacementKey(placementKey))
+	placementObj, err := controller.FetchPlacementFromQueueKey(ctx, r.Client, queue.PlacementKey(placementKey))
 	if err != nil {
 		if apierrors.IsNotFound(err) {
 			klog.V(4).InfoS("Ignoring NotFound placement", "placementKey", placementKey)
diff --git a/pkg/controllers/rollout/controller.go b/pkg/controllers/rollout/controller.go
@@ -72,7 +72,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req runtime.Request) (runtim
 	}()
 
 	// Get the placement object (either ClusterResourcePlacement or ResourcePlacement)
-	placementObj, err := controller.FetchPlacementFromKey(ctx, r.Client, controller.GetObjectKeyFromRequest(req))
+	placementObj, err := controller.FetchPlacementFromQueueKey(ctx, r.Client, controller.GetObjectKeyFromRequest(req))
 	if err != nil {
 		if errors.IsNotFound(err) {
 			klog.V(4).InfoS("Ignoring NotFound placement", "placementKey", placementKey)
diff --git a/pkg/controllers/updaterun/controller.go b/pkg/controllers/updaterun/controller.go
@@ -378,13 +378,15 @@ func emitUpdateRunStatusMetric(updateRun *placementv1beta1.ClusterStagedUpdateRu
 	klog.V(2).InfoS("There's no valid status condition on updateRun, status updating failed possibly", "updateRun", klog.KObj(updateRun))
 }
 
-func removeWaitTimeFromUpdateRunStatus(updateRun *placementv1beta1.ClusterStagedUpdateRun) {
+func removeWaitTimeFromUpdateRunStatus(updateRun placementv1beta1.UpdateRunObj) {
 	// Remove waitTime from the updateRun status for AfterStageTask for type Approval.
-	if updateRun.Status.UpdateStrategySnapshot != nil {
-		for i := range updateRun.Status.UpdateStrategySnapshot.Stages {
-			for j := range updateRun.Status.UpdateStrategySnapshot.Stages[i].AfterStageTasks {
-				if updateRun.Status.UpdateStrategySnapshot.Stages[i].AfterStageTasks[j].Type == placementv1beta1.AfterStageTaskTypeApproval {
-					updateRun.Status.UpdateStrategySnapshot.Stages[i].AfterStageTasks[j].WaitTime = nil
+	// Use interface methods to access and update status
+	updateRunStatus := updateRun.GetUpdateRunStatus()
+	if updateRunStatus.UpdateStrategySnapshot != nil {
+		for i := range updateRunStatus.UpdateStrategySnapshot.Stages {
+			for j := range updateRunStatus.UpdateStrategySnapshot.Stages[i].AfterStageTasks {
+				if updateRunStatus.UpdateStrategySnapshot.Stages[i].AfterStageTasks[j].Type == placementv1beta1.AfterStageTaskTypeApproval {
+					updateRunStatus.UpdateStrategySnapshot.Stages[i].AfterStageTasks[j].WaitTime = nil
 				}
 			}
 		}
diff --git a/pkg/controllers/updaterun/initialization.go b/pkg/controllers/updaterun/initialization.go
diff --git a/pkg/controllers/updaterun/initialization_integration_test.go b/pkg/controllers/updaterun/initialization_integration_test.go
@@ -49,7 +49,7 @@ const (
 	regionWestus = "westus"
 )
 
-var _ = Describe("Updaterun initialization tests", func() {
+var _ = FDescribe("Updaterun initialization tests", func() {
 	var updateRun *placementv1beta1.ClusterStagedUpdateRun
 	var crp *placementv1beta1.ClusterResourcePlacement
 	var policySnapshot *placementv1beta1.ClusterSchedulingPolicySnapshot
@@ -138,7 +138,7 @@ var _ = Describe("Updaterun initialization tests", func() {
 			Expect(k8sClient.Create(ctx, updateRun)).To(Succeed())
 
 			By("Validating the initialization failed")
-			validateFailedInitCondition(ctx, updateRun, "parent clusterResourcePlacement not found")
+			validateFailedInitCondition(ctx, updateRun, "parent placement not found")
 		})
 
 		It("Should fail to initialize if CRP does not have external rollout strategy type", func() {
@@ -151,7 +151,7 @@ var _ = Describe("Updaterun initialization tests", func() {
 
 			By("Validating the initialization failed")
 			validateFailedInitCondition(ctx, updateRun,
-				"parent clusterResourcePlacement does not have an external rollout strategy")
+				"parent placement does not have an external rollout strategy")
 		})
 
 		It("Should copy the ApplyStrategy in the CRP to the UpdateRun", func() {
@@ -405,7 +405,7 @@ var _ = Describe("Updaterun initialization tests", func() {
 			Expect(k8sClient.Create(ctx, updateRun)).To(Succeed())
 
 			By("Validating the initialization failed")
-			validateFailedInitCondition(ctx, updateRun, "no scheduled or to-be-deleted clusterResourceBindings found")
+			validateFailedInitCondition(ctx, updateRun, "no scheduled or to-be-deleted bindings found")
 		})
 
 		It("Should fail to initialize if the number of selected bindings does not match the observed cluster count", func() {
@@ -505,7 +505,7 @@ var _ = Describe("Updaterun initialization tests", func() {
 
 			By("Validating the initialization not failed due to no selected cluster")
 			// it should fail due to strategy not found
-			validateFailedInitCondition(ctx, updateRun, "referenced clusterStagedUpdateStrategy not found")
+			validateFailedInitCondition(ctx, updateRun, "referenced stagedUpdateStrategyObj not found")
 		})
 
 		It("Should update the ObservedClusterCount to the number of scheduled bindings if it's pickAll policy", func() {
@@ -517,7 +517,7 @@ var _ = Describe("Updaterun initialization tests", func() {
 
 			By("Validating the initialization not failed due to no selected cluster")
 			// it should fail due to strategy not found
-			validateFailedInitCondition(ctx, updateRun, "referenced clusterStagedUpdateStrategy not found")
+			validateFailedInitCondition(ctx, updateRun, "referenced stagedUpdateStrategyObj not found")
 
 			By("Validating the ObservedClusterCount is updated")
 			Expect(updateRun.Status.PolicyObservedClusterCount).To(Equal(1), "failed to update the updateRun PolicyObservedClusterCount status")
@@ -565,7 +565,7 @@ var _ = Describe("Updaterun initialization tests", func() {
 			Expect(k8sClient.Create(ctx, updateRun)).To(Succeed())
 
 			By("Validating the initialization failed")
-			validateFailedInitCondition(ctx, updateRun, "referenced clusterStagedUpdateStrategy not found")
+			validateFailedInitCondition(ctx, updateRun, "referenced stagedUpdateStrategyObj not found")
 		})
 
 		Context("Test computeRunStageStatus", func() {
@@ -777,7 +777,7 @@ var _ = Describe("Updaterun initialization tests", func() {
 			Expect(k8sClient.Create(ctx, updateRun)).To(Succeed())
 
 			By("Validating the initialization failed")
-			validateFailedInitCondition(ctx, updateRun, "no clusterResourceSnapshots with index `0` found")
+			validateFailedInitCondition(ctx, updateRun, "no resourceSnapshots with index `0` found")
 
 			By("Checking update run status metrics are emitted")
 			validateUpdateRunMetricsEmitted(generateInitializationFailedMetric(updateRun))
@@ -792,7 +792,7 @@ var _ = Describe("Updaterun initialization tests", func() {
 			Expect(k8sClient.Create(ctx, updateRun)).To(Succeed())
 
 			By("Validating the initialization failed")
-			validateFailedInitCondition(ctx, updateRun, "no clusterResourceSnapshots with index `0` found")
+			validateFailedInitCondition(ctx, updateRun, "no resourceSnapshots with index `0` found")
 
 			By("Checking update run status metrics are emitted")
 			validateUpdateRunMetricsEmitted(generateInitializationFailedMetric(updateRun))
@@ -807,7 +807,7 @@ var _ = Describe("Updaterun initialization tests", func() {
 			Expect(k8sClient.Create(ctx, updateRun)).To(Succeed())
 
 			By("Validating the initialization failed")
-			validateFailedInitCondition(ctx, updateRun, "no clusterResourceSnapshots with index `0` found")
+			validateFailedInitCondition(ctx, updateRun, "no resourceSnapshots with index `0` found")
 
 			By("Checking update run status metrics are emitted")
 			validateUpdateRunMetricsEmitted(generateInitializationFailedMetric(updateRun))
@@ -822,7 +822,7 @@ var _ = Describe("Updaterun initialization tests", func() {
 			Expect(k8sClient.Create(ctx, updateRun)).To(Succeed())
 
 			By("Validating the initialization failed")
-			validateFailedInitCondition(ctx, updateRun, "no master clusterResourceSnapshot found for clusterResourcePlacement")
+			validateFailedInitCondition(ctx, updateRun, "no master resourceSnapshot found for clusterResourcePlacement")
 
 			By("Checking update run status metrics are emitted")
 			validateUpdateRunMetricsEmitted(generateInitializationFailedMetric(updateRun))
diff --git a/pkg/controllers/updaterun/validation.go b/pkg/controllers/updaterun/validation.go
@@ -44,7 +44,7 @@ func (r *Reconciler) validate(
 	klog.V(2).InfoS("Start to validate the clusterStagedUpdateRun", "clusterStagedUpdateRun", updateRunRef)
 
 	// Validate the ClusterResourcePlacement object referenced by the ClusterStagedUpdateRun.
-	placementName, err := r.validateCRP(ctx, updateRunCopy)
+	placementName, err := r.validatePlacement(ctx, updateRunCopy)
 	if err != nil {
 		return -1, nil, nil, err
 	}
@@ -75,16 +75,27 @@ func (r *Reconciler) validate(
 	}
 
 	// Collect the clusters by the corresponding ClusterResourcePlacement with the latest policy snapshot.
-	scheduledBindings, toBeDeletedBindings, err := r.collectScheduledClusters(ctx, placementName, latestPolicySnapshot, updateRunCopy)
+	scheduledBindingObjs, toBeDeletedBindingObjs, err := r.collectScheduledClusters(ctx, placementName, latestPolicySnapshot, updateRunCopy)
 	if err != nil {
 		return -1, nil, nil, err
 	}
 
 	// Validate the stages and return the updating stage index.
-	updatingStageIndex, err := r.validateStagesStatus(ctx, scheduledBindings, toBeDeletedBindings, updateRun, updateRunCopy)
+	updatingStageIndex, err := r.validateStagesStatus(ctx, scheduledBindingObjs, toBeDeletedBindingObjs, updateRun, updateRunCopy)
 	if err != nil {
 		return -1, nil, nil, err
 	}
+
+	// TODO (arvindth): remove this conversion step after refactoring other functions to use interface types.
+	scheduledBindings, err := controller.ConvertBindingObjsToConcreteCRBArray(scheduledBindingObjs)
+	if err != nil {
+		return -1, nil, nil, err
+	}
+	toBeDeletedBindings, err := controller.ConvertBindingObjsToConcreteCRBArray(toBeDeletedBindingObjs)
+	if err != nil {
+		return -1, nil, nil, err
+	}
+
 	return updatingStageIndex, scheduledBindings, toBeDeletedBindings, nil
 }
 
@@ -95,7 +106,7 @@ func (r *Reconciler) validate(
 // If the updating stage index is len(updateRun.Status.StagesStatus), the next stage to be updated will be the delete stage.
 func (r *Reconciler) validateStagesStatus(
 	ctx context.Context,
-	scheduledBindings, toBeDeletedBindings []*placementv1beta1.ClusterResourceBinding,
+	scheduledBindingObjs, toBeDeletedBindingObjs []placementv1beta1.BindingObj,
 	updateRun, updateRunCopy *placementv1beta1.ClusterStagedUpdateRun,
 ) (int, error) {
 	updateRunRef := klog.KObj(updateRun)
@@ -108,7 +119,7 @@ func (r *Reconciler) validateStagesStatus(
 		klog.ErrorS(unexpectedErr, "Failed to find the updateStrategySnapshot in the clusterStagedUpdateRun", "clusterStagedUpdateRun", updateRunRef)
 		return -1, fmt.Errorf("%w: %s", errStagedUpdatedAborted, unexpectedErr.Error())
 	}
-	if err := r.computeRunStageStatus(ctx, scheduledBindings, updateRunCopy); err != nil {
+	if err := r.computeRunStageStatus(ctx, scheduledBindingObjs, updateRunCopy); err != nil {
 		return -1, err
 	}
 
@@ -124,7 +135,7 @@ func (r *Reconciler) validateStagesStatus(
 		return -1, validateErr
 	}
 
-	return validateDeleteStageStatus(updatingStageIndex, lastFinishedStageIndex, len(existingStageStatus), toBeDeletedBindings, updateRunCopy)
+	return validateDeleteStageStatus(updatingStageIndex, lastFinishedStageIndex, len(existingStageStatus), toBeDeletedBindingObjs, updateRunCopy)
 }
 
 // validateUpdateStagesStatus is a helper function to validate the updating stages in the clusterStagedUpdateRun.
@@ -256,7 +267,7 @@ func validateClusterUpdatingStatus(
 // It returns the updating stage index, or any error encountered.
 func validateDeleteStageStatus(
 	updatingStageIndex, lastFinishedStageIndex, totalStages int,
-	toBeDeletedBindings []*placementv1beta1.ClusterResourceBinding,
+	toBeDeletedBindingObjs []placementv1beta1.BindingObj,
 	updateRun *placementv1beta1.ClusterStagedUpdateRun,
 ) (int, error) {
 	updateRunRef := klog.KObj(updateRun)
@@ -274,10 +285,11 @@ func validateDeleteStageStatus(
 	for _, cluster := range existingDeleteStageStatus.Clusters {
 		deletingClusterMap[cluster.ClusterName] = struct{}{}
 	}
-	for _, binding := range toBeDeletedBindings {
-		if _, ok := deletingClusterMap[binding.Spec.TargetCluster]; !ok {
-			unexpectedErr := controller.NewUnexpectedBehaviorError(fmt.Errorf("the cluster `%s` to be deleted is not in the delete stage", binding.Spec.TargetCluster))
-			klog.ErrorS(unexpectedErr, "Detect new cluster to be unscheduled", "clusterResourceBinding", klog.KObj(binding), "clusterStagedUpdateRun", updateRunRef)
+	for _, bindingObj := range toBeDeletedBindingObjs {
+		bindingSpec := bindingObj.GetBindingSpec()
+		if _, ok := deletingClusterMap[bindingSpec.TargetCluster]; !ok {
+			unexpectedErr := controller.NewUnexpectedBehaviorError(fmt.Errorf("the cluster `%s` to be deleted is not in the delete stage", bindingSpec.TargetCluster))
+			klog.ErrorS(unexpectedErr, "Detect new cluster to be unscheduled", "binding", klog.KObj(bindingObj), "clusterStagedUpdateRun", updateRunRef)
 			return -1, fmt.Errorf("%w: %s", errStagedUpdatedAborted, unexpectedErr.Error())
 		}
 	}
diff --git a/pkg/controllers/updaterun/validation_test.go b/pkg/controllers/updaterun/validation_test.go
@@ -244,7 +244,7 @@ func TestValidateDeleteStageStatus(t *testing.T) {
 		name                   string
 		updatingStageIndex     int
 		lastFinishedStageIndex int
-		toBeDeletedBindings    []*placementv1beta1.ClusterResourceBinding
+		toBeDeletedBindings    []placementv1beta1.BindingObj
 		deleteStageStatus      *placementv1beta1.StageUpdatingStatus
 		wantErr                error
 		wantUpdatingStageIndex int
@@ -257,12 +257,12 @@ func TestValidateDeleteStageStatus(t *testing.T) {
 		},
 		{
 			name: "validateDeleteStageStatus should return error if there's new to-be-deleted bindings",
-			toBeDeletedBindings: []*placementv1beta1.ClusterResourceBinding{
-				{
+			toBeDeletedBindings: []placementv1beta1.BindingObj{
+				&placementv1beta1.ClusterResourceBinding{
 					ObjectMeta: metav1.ObjectMeta{Name: "binding-1"},
 					Spec:       placementv1beta1.ResourceBindingSpec{TargetCluster: "cluster-1"},
 				},
-				{
+				&placementv1beta1.ClusterResourceBinding{
 					ObjectMeta: metav1.ObjectMeta{Name: "binding-2"},
 					Spec:       placementv1beta1.ResourceBindingSpec{TargetCluster: "cluster-2"},
 				},
@@ -280,8 +280,8 @@ func TestValidateDeleteStageStatus(t *testing.T) {
 			name:                   "validateDeleteStageStatus should not return error if there's fewer to-be-deleted bindings",
 			updatingStageIndex:     -1,
 			lastFinishedStageIndex: -1,
-			toBeDeletedBindings: []*placementv1beta1.ClusterResourceBinding{
-				{
+			toBeDeletedBindings: []placementv1beta1.BindingObj{
+				&placementv1beta1.ClusterResourceBinding{
 					ObjectMeta: metav1.ObjectMeta{Name: "binding-1"},
 					Spec:       placementv1beta1.ResourceBindingSpec{TargetCluster: "cluster-1"},
 				},
@@ -300,8 +300,8 @@ func TestValidateDeleteStageStatus(t *testing.T) {
 			name:                   "validateDeleteStageStatus should not return error if there are equal to-be-deleted bindings",
 			updatingStageIndex:     -1,
 			lastFinishedStageIndex: -1,
-			toBeDeletedBindings: []*placementv1beta1.ClusterResourceBinding{
-				{
+			toBeDeletedBindings: []placementv1beta1.BindingObj{
+				&placementv1beta1.ClusterResourceBinding{
 					ObjectMeta: metav1.ObjectMeta{Name: "binding-1"},
 					Spec:       placementv1beta1.ResourceBindingSpec{TargetCluster: "cluster-1"},
 				},
diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go
@@ -134,7 +134,7 @@ func (s *Scheduler) scheduleOnce(ctx context.Context, worker int) {
 	}()
 
 	// Retrieve the placement object (either ClusterResourcePlacement or ResourcePlacement).
-	placement, err := controller.FetchPlacementFromKey(ctx, s.client, placementKey)
+	placement, err := controller.FetchPlacementFromQueueKey(ctx, s.client, placementKey)
 	if err != nil {
 		if apiErrors.IsNotFound(err) {
 			// The placement has been gone before the scheduler gets a chance to
diff --git a/pkg/scheduler/watchers/placement/watcher.go b/pkg/scheduler/watchers/placement/watcher.go
@@ -55,7 +55,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 
 	// Retrieve the placement object (either ClusterResourcePlacement or ResourcePlacement).
 	placementKey := controller.GetObjectKeyFromRequest(req)
-	placement, err := controller.FetchPlacementFromKey(ctx, r.Client, placementKey)
+	placement, err := controller.FetchPlacementFromQueueKey(ctx, r.Client, placementKey)
 	if err != nil {
 		klog.ErrorS(err, "Failed to get placement", "placement", placementRef)
 		return ctrl.Result{}, controller.NewAPIServerError(true, client.IgnoreNotFound(err))
diff --git a/pkg/utils/controller/binding_resolver.go b/pkg/utils/controller/binding_resolver.go
@@ -18,6 +18,7 @@ package controller
 
 import (
 	"context"
+	"fmt"
 
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -122,3 +123,17 @@ func ConvertRBArrayToBindingObjs(bindings []*placementv1beta1.ResourceBinding) [
 	}
 	return result
 }
+
+// ConvertBindingObjsToConcreteCRBArray converts a slice of BindingObj interfaces to a slice of concrete ClusterResourceBinding pointers.
+func ConvertBindingObjsToConcreteCRBArray(bindingObjs []placementv1beta1.BindingObj) ([]*placementv1beta1.ClusterResourceBinding, error) {
+	bindings := make([]*placementv1beta1.ClusterResourceBinding, len(bindingObjs))
+
+	for i, bindingObj := range bindingObjs {
+		if crb, ok := bindingObj.(*placementv1beta1.ClusterResourceBinding); ok {
+			bindings[i] = crb
+		} else {
+			return nil, fmt.Errorf("expected ClusterResourceBinding but got %T - initialize function needs further refactoring for namespace-scoped resources", bindingObj)
+		}
+	}
+	return bindings, nil
+}
diff --git a/pkg/utils/controller/placement_resolver.go b/pkg/utils/controller/placement_resolver.go
@@ -35,27 +35,29 @@ const (
 	namespaceSeparator = "/"
 )
 
-// FetchPlacementFromKey resolves a PlacementKey to a concrete placement object that implements PlacementObj.
-func FetchPlacementFromKey(ctx context.Context, c client.Reader, placementKey queue.PlacementKey) (fleetv1beta1.PlacementObj, error) {
+// FetchPlacementFromQueueKey resolves a Queue PlacementKey to a concrete placement object that implements PlacementObj.
+func FetchPlacementFromQueueKey(ctx context.Context, c client.Reader, placementKey queue.PlacementKey) (fleetv1beta1.PlacementObj, error) {
 	// Extract namespace and name from the placement key
 	namespace, name, err := ExtractNamespaceNameFromKey(placementKey)
 	if err != nil {
 		return nil, err
 	}
+	return FetchPlacementFromNamespacedName(ctx, c, types.NamespacedName{Namespace: namespace, Name: name})
+}
+
+// FetchPlacementFromNamespacedName resolves a NamespacedName to a concrete placement object that implements PlacementObj.
+func FetchPlacementFromNamespacedName(ctx context.Context, c client.Reader, nn types.NamespacedName) (fleetv1beta1.PlacementObj, error) {
 	// Check if the key contains a namespace separator
 	var placement fleetv1beta1.PlacementObj
-	if namespace != "" {
+	if nn.Namespace != "" {
 		// This is a namespaced ResourcePlacement
 		placement = &fleetv1beta1.ResourcePlacement{}
 	} else {
 		// This is a cluster-scoped ClusterResourcePlacement
 		placement = &fleetv1beta1.ClusterResourcePlacement{}
 	}
-	key := types.NamespacedName{
-		Namespace: namespace,
-		Name:      name,
-	}
-	if err := c.Get(ctx, key, placement); err != nil {
+
+	if err := c.Get(ctx, nn, placement); err != nil {
 		return nil, err
 	}
 	return placement, nil
@@ -94,6 +96,14 @@ func GetObjectKeyFromNamespaceName(namespace, name string) string {
 	}
 }
 
+// GetNamespacedNameFromObject generates a NamespacedName from a meta object.
+func GetNamespacedNameFromObject(obj metav1.Object) types.NamespacedName {
+	return types.NamespacedName{
+		Namespace: obj.GetNamespace(),
+		Name:      obj.GetName(),
+	}
+}
+
 // ExtractNamespaceNameFromKey resolves a PlacementKey to a (namespace, name) tuple of the placement object.
 func ExtractNamespaceNameFromKey(key queue.PlacementKey) (string, string, error) {
 	return ExtractNamespaceNameFromKeyStr(string(key))
diff --git a/pkg/utils/controller/placement_resolver_test.go b/pkg/utils/controller/placement_resolver_test.go
diff --git a/pkg/utils/controller/strategy_resolver.go b/pkg/utils/controller/strategy_resolver.go

Original file line number	Diff line number	Diff line change
`@@ -378,13 +378,15 @@ func emitUpdateRunStatusMetric(updateRun *placementv1beta1.ClusterStagedUpdateRu`
`378`	`378`	`klog.V(2).InfoS("There's no valid status condition on updateRun, status updating failed possibly", "updateRun", klog.KObj(updateRun))`
`379`	`379`	`}`
`380`	`380`
`381`		`-func removeWaitTimeFromUpdateRunStatus(updateRun *placementv1beta1.ClusterStagedUpdateRun) {`
	`381`	`+func removeWaitTimeFromUpdateRunStatus(updateRun placementv1beta1.UpdateRunObj) {`
`382`	`382`	`// Remove waitTime from the updateRun status for AfterStageTask for type Approval.`
`383`		`- if updateRun.Status.UpdateStrategySnapshot != nil {`
`384`		`- for i := range updateRun.Status.UpdateStrategySnapshot.Stages {`
`385`		`- for j := range updateRun.Status.UpdateStrategySnapshot.Stages[i].AfterStageTasks {`
`386`		`- if updateRun.Status.UpdateStrategySnapshot.Stages[i].AfterStageTasks[j].Type == placementv1beta1.AfterStageTaskTypeApproval {`
`387`		`- updateRun.Status.UpdateStrategySnapshot.Stages[i].AfterStageTasks[j].WaitTime = nil`
	`383`	`+ // Use interface methods to access and update status`
	`384`	`+ updateRunStatus := updateRun.GetUpdateRunStatus()`
	`385`	`+ if updateRunStatus.UpdateStrategySnapshot != nil {`
	`386`	`+ for i := range updateRunStatus.UpdateStrategySnapshot.Stages {`
	`387`	`+ for j := range updateRunStatus.UpdateStrategySnapshot.Stages[i].AfterStageTasks {`
	`388`	`+ if updateRunStatus.UpdateStrategySnapshot.Stages[i].AfterStageTasks[j].Type == placementv1beta1.AfterStageTaskTypeApproval {`
	`389`	`+ updateRunStatus.UpdateStrategySnapshot.Stages[i].AfterStageTasks[j].WaitTime = nil`
`388`	`390`	`}`
`389`	`391`	`}`
`390`	`392`	`}`