Address comments

fabriziopandini · fabriziopandini · commit 28115c9604e2 · 2025-11-10T15:21:46.000+01:00
diff --git a/api/core/v1beta2/cluster_types.go b/api/core/v1beta2/cluster_types.go
@@ -113,7 +113,6 @@ const (
 
 	// ClusterTopologyReconciledMachinePoolsUpgradeDeferredReason documents reconciliation of a Cluster topology
 	// not yet completed because the upgrade for at least one of the MachinePools has been deferred.
-	// Deprecated: please use ClusterUpgrading instead.
 	ClusterTopologyReconciledMachinePoolsUpgradeDeferredReason = "MachinePoolsUpgradeDeferred"
 
 	// ClusterTopologyReconciledHookBlockingReason documents reconciliation of a Cluster topology
diff --git a/api/core/v1beta2/v1beta1_condition_consts.go b/api/core/v1beta2/v1beta1_condition_consts.go
@@ -340,9 +340,9 @@ const (
 	// Deprecated: please use ClusterUpgrading instead.
 	TopologyReconciledHookBlockingV1Beta1Reason = "LifecycleHookBlocking"
 
-	// ClusterTopologyReconciledClusterUpgradingV1Beta1Reason documents reconciliation of a Cluster topology
+	// TopologyReconciledClusterUpgradingV1Beta1Reason documents reconciliation of a Cluster topology
 	// not yet completed because a cluster upgrade is still in progress.
-	ClusterTopologyReconciledClusterUpgradingV1Beta1Reason = "ClusterUpgrading"
+	TopologyReconciledClusterUpgradingV1Beta1Reason = "ClusterUpgrading"
 
 	// TopologyReconciledClusterClassNotReconciledV1Beta1Reason (Severity=Info) documents reconciliation of a Cluster topology not
 	// yet completed because the ClusterClass has not reconciled yet. If this condition persists there may be an issue
diff --git a/exp/topology/desiredstate/desired_state_test.go b/exp/topology/desiredstate/desired_state_test.go
@@ -1064,10 +1064,8 @@ func TestComputeControlPlaneVersion(t *testing.T) {
 	_ = runtimehooksv1.AddToCatalog(catalog)
 	beforeClusterUpgradeGVH, _ := catalog.GroupVersionHook(runtimehooksv1.BeforeClusterUpgrade)
 	beforeControlPlaneUpgradeGVH, _ := catalog.GroupVersionHook(runtimehooksv1.BeforeControlPlaneUpgrade)
-	afterControlPlaneUpgradeGVH, _ := catalog.GroupVersionHook(runtimehooksv1.AfterControlPlaneUpgrade)
 	beforeWorkersUpgradeGVH, _ := catalog.GroupVersionHook(runtimehooksv1.BeforeWorkersUpgrade)
 	afterWorkersUpgradeGVH, _ := catalog.GroupVersionHook(runtimehooksv1.AfterWorkersUpgrade)
-	afterClusterUpgradeGVH, _ := catalog.GroupVersionHook(runtimehooksv1.AfterClusterUpgrade)
 
 	nonBlockingBeforeClusterUpgradeResponse := &runtimehooksv1.BeforeClusterUpgradeResponse{
 		CommonRetryResponse: runtimehooksv1.CommonRetryResponse{
@@ -1698,10 +1696,8 @@ func TestComputeControlPlaneVersion(t *testing.T) {
 				WithGetAllExtensionResponses(map[runtimecatalog.GroupVersionHook][]string{
 					beforeClusterUpgradeGVH:      {"foo"},
 					beforeControlPlaneUpgradeGVH: {"foo"},
-					afterControlPlaneUpgradeGVH:  {"foo"},
 					beforeWorkersUpgradeGVH:      {"foo"},
 					afterWorkersUpgradeGVH:       {"foo"},
-					afterClusterUpgradeGVH:       {"foo"},
 				}).
 				WithCallAllExtensionResponses(map[runtimecatalog.GroupVersionHook]runtimehooksv1.ResponseObject{
 					beforeClusterUpgradeGVH:      tt.beforeClusterUpgradeResponse,
diff --git a/exp/topology/desiredstate/lifecycle_hooks.go b/exp/topology/desiredstate/lifecycle_hooks.go
@@ -40,15 +40,6 @@ func (g *generator) callBeforeClusterUpgradeHook(ctx context.Context, s *scope.S
 	log := ctrl.LoggerFrom(ctx)
 
 	if !hooks.IsPending(runtimehooksv1.AfterClusterUpgrade, s.Current.Cluster) {
-		// Return quickly if the hook is not defined.
-		extensionHandlers, err := g.RuntimeClient.GetAllExtensions(ctx, runtimehooksv1.BeforeClusterUpgrade, s.Current.Cluster)
-		if err != nil {
-			return false, err
-		}
-		if len(extensionHandlers) == 0 {
-			return true, nil
-		}
-
 		var hookAnnotations []string
 		for key := range s.Current.Cluster.Annotations {
 			if strings.HasPrefix(key, clusterv1.BeforeClusterUpgradeHookAnnotationPrefix) {
@@ -57,9 +48,9 @@ func (g *generator) callBeforeClusterUpgradeHook(ctx context.Context, s *scope.S
 		}
 		if len(hookAnnotations) > 0 {
 			slices.Sort(hookAnnotations)
-			message := fmt.Sprintf("annotations [%s] are set", strings.Join(hookAnnotations, ", "))
+			message := fmt.Sprintf("annotations %s are set", strings.Join(hookAnnotations, ", "))
 			if len(hookAnnotations) == 1 {
-				message = fmt.Sprintf("annotation [%s] is set", strings.Join(hookAnnotations, ", "))
+				message = fmt.Sprintf("annotation %s is set", strings.Join(hookAnnotations, ", "))
 			}
 			// Add the hook with a response to the tracker so we can later update the condition.
 			s.HookResponseTracker.Add(runtimehooksv1.BeforeClusterUpgrade, &runtimehooksv1.BeforeClusterUpgradeResponse{
@@ -81,6 +72,15 @@ func (g *generator) callBeforeClusterUpgradeHook(ctx context.Context, s *scope.S
 			return false, nil
 		}
 
+		// Return quickly if the hook is not defined.
+		extensionHandlers, err := g.RuntimeClient.GetAllExtensions(ctx, runtimehooksv1.BeforeClusterUpgrade, s.Current.Cluster)
+		if err != nil {
+			return false, err
+		}
+		if len(extensionHandlers) == 0 {
+			return true, nil
+		}
+
 		v1beta1Cluster := &clusterv1beta1.Cluster{}
 		// DeepCopy cluster because ConvertFrom has side effects like adding the conversion annotation.
 		if err := v1beta1Cluster.ConvertFrom(s.Current.Cluster.DeepCopy()); err != nil {
@@ -110,7 +110,7 @@ func (g *generator) callBeforeClusterUpgradeHook(ctx context.Context, s *scope.S
 			return false, nil
 		}
 
-		log.Info(fmt.Sprintf("Control plane upgrade from version %s to version %s unblocked by %s hook", hookRequest.FromKubernetesVersion, hookRequest.ToKubernetesVersion, runtimecatalog.HookName(runtimehooksv1.BeforeClusterUpgrade)),
+		log.Info(fmt.Sprintf("Cluster upgrade from version %s to version %s unblocked by %s hook", hookRequest.FromKubernetesVersion, hookRequest.ToKubernetesVersion, runtimecatalog.HookName(runtimehooksv1.BeforeClusterUpgrade)),
 			"ControlPlaneUpgrades", hookRequest.ControlPlaneUpgrades,
 			"WorkersUpgrades", hookRequest.WorkersUpgrades,
 		)
@@ -214,7 +214,7 @@ func (g *generator) callAfterControlPlaneUpgradeHook(ctx context.Context, s *sco
 		s.HookResponseTracker.Add(runtimehooksv1.AfterControlPlaneUpgrade, hookResponse)
 
 		if hookResponse.RetryAfterSeconds != 0 {
-			log.Info(fmt.Sprintf("Cluster Upgrade to version %s is blocked by %s hook", hookRequest.KubernetesVersion, runtimecatalog.HookName(runtimehooksv1.AfterControlPlaneUpgrade)),
+			log.Info(fmt.Sprintf("Cluster upgrade to version %s is blocked by %s hook", hookRequest.KubernetesVersion, runtimecatalog.HookName(runtimehooksv1.AfterControlPlaneUpgrade)),
 				"ControlPlaneUpgrades", hookRequest.ControlPlaneUpgrades,
 				"WorkersUpgrades", hookRequest.WorkersUpgrades,
 			)
diff --git a/exp/topology/desiredstate/lifecycle_hooks_test.go b/exp/topology/desiredstate/lifecycle_hooks_test.go
@@ -77,7 +77,6 @@ func TestComputeControlPlaneVersion_LifecycleHooksSequences(t *testing.T) {
 	afterControlPlaneUpgradeGVH, _ := catalog.GroupVersionHook(runtimehooksv1.AfterControlPlaneUpgrade)
 	beforeWorkersUpgradeGVH, _ := catalog.GroupVersionHook(runtimehooksv1.BeforeWorkersUpgrade)
 	afterWorkersUpgradeGVH, _ := catalog.GroupVersionHook(runtimehooksv1.AfterWorkersUpgrade)
-	afterClusterUpgradeGVH, _ := catalog.GroupVersionHook(runtimehooksv1.AfterClusterUpgrade)
 
 	blockingBeforeClusterUpgradeResponse := &runtimehooksv1.BeforeClusterUpgradeResponse{
 		CommonRetryResponse: runtimehooksv1.CommonRetryResponse{
@@ -1231,7 +1230,6 @@ func TestComputeControlPlaneVersion_LifecycleHooksSequences(t *testing.T) {
 					afterControlPlaneUpgradeGVH:  {"foo"},
 					beforeWorkersUpgradeGVH:      {"foo"},
 					afterWorkersUpgradeGVH:       {"foo"},
-					afterClusterUpgradeGVH:       {"foo"},
 				}).
 				WithCallAllExtensionResponses(map[runtimecatalog.GroupVersionHook]runtimehooksv1.ResponseObject{
 					beforeClusterUpgradeGVH:      tt.beforeClusterUpgradeResponse,
diff --git a/exp/topology/scope/hookresponsetracker.go b/exp/topology/scope/hookresponsetracker.go
@@ -81,7 +81,7 @@ func (h *HookResponseTracker) AggregateRetryAfter() time.Duration {
 }
 
 // AggregateMessage returns a human friendly message about the blocking status of hooks.
-func (h *HookResponseTracker) AggregateMessage() string {
+func (h *HookResponseTracker) AggregateMessage(action string) string {
 	blockingHooks := map[string]string{}
 	for hook, resp := range h.responses {
 		if retryResponse, ok := resp.(runtimehooksv1.RetryResponseObject); ok {
@@ -102,5 +102,5 @@ func (h *HookResponseTracker) AggregateMessage() string {
 			hookAndMessages = append(hookAndMessages, fmt.Sprintf("%s: %s", hook, message))
 		}
 	}
-	return fmt.Sprintf("Following hooks are blocking upgrade progress: %s", strings.Join(hookAndMessages, "; "))
+	return fmt.Sprintf("Following hooks are blocking %s: %s", action, strings.Join(hookAndMessages, "; "))
 }
diff --git a/exp/topology/scope/hookresponsetracker_test.go b/exp/topology/scope/hookresponsetracker_test.go
@@ -132,8 +132,8 @@ func TestHookResponseTracker_AggregateMessage(t *testing.T) {
 		hrt.Add(runtimehooksv1.BeforeClusterCreate, blockingBeforeClusterCreateResponse)
 		hrt.Add(runtimehooksv1.BeforeClusterUpgrade, blockingBeforeClusterUpgradeResponse)
 
-		g.Expect(hrt.AggregateMessage()).To(ContainSubstring(runtimecatalog.HookName(runtimehooksv1.BeforeClusterCreate)))
-		g.Expect(hrt.AggregateMessage()).To(ContainSubstring(runtimecatalog.HookName(runtimehooksv1.BeforeClusterUpgrade)))
+		g.Expect(hrt.AggregateMessage("upgrade")).To(ContainSubstring(runtimecatalog.HookName(runtimehooksv1.BeforeClusterCreate)))
+		g.Expect(hrt.AggregateMessage("upgrade")).To(ContainSubstring(runtimecatalog.HookName(runtimehooksv1.BeforeClusterUpgrade)))
 	})
 	t.Run("AggregateMessage should return empty string if there are no blocking hook responses", func(t *testing.T) {
 		g := NewWithT(t)
@@ -142,7 +142,7 @@ func TestHookResponseTracker_AggregateMessage(t *testing.T) {
 		hrt.Add(runtimehooksv1.BeforeClusterCreate, nonBlockingBeforeClusterCreateResponse)
 		hrt.Add(runtimehooksv1.BeforeClusterUpgrade, nonBlockingBeforeClusterUpgradeResponse)
 
-		g.Expect(hrt.AggregateMessage()).To(Equal(""))
+		g.Expect(hrt.AggregateMessage("upgrade")).To(Equal(""))
 	})
 }
 
diff --git a/internal/controllers/cluster/cluster_controller_status_test.go b/internal/controllers/cluster/cluster_controller_status_test.go
@@ -2846,7 +2846,7 @@ func TestSetAvailableCondition(t *testing.T) {
 						{
 							Type:   clusterv1.ClusterTopologyReconciledCondition,
 							Status: metav1.ConditionFalse,
-							Reason: clusterv1.ClusterTopologyReconciledClusterUpgradingV1Beta1Reason,
+							Reason: clusterv1.ClusterTopologyReconciledClusterUpgradingReason,
 							Message: "Cluster is upgrading to v1.22.0\n" +
 								"  * MachineDeployment md1 upgrading to version v1.22.0",
 						},
@@ -2907,7 +2907,7 @@ func TestSetAvailableCondition(t *testing.T) {
 						{
 							Type:   clusterv1.ClusterTopologyReconciledCondition,
 							Status: metav1.ConditionFalse,
-							Reason: clusterv1.ClusterTopologyReconciledClusterUpgradingV1Beta1Reason,
+							Reason: clusterv1.ClusterTopologyReconciledClusterUpgradingReason,
 							Message: "Cluster is upgrading to v1.22.0\n" +
 								"  * MachineDeployment md1 upgrading to version v1.22.0",
 						},
diff --git a/internal/controllers/topology/cluster/cluster_controller.go b/internal/controllers/topology/cluster/cluster_controller.go
@@ -440,10 +440,7 @@ func (r *Reconciler) callBeforeClusterCreateHook(ctx context.Context, s *scope.S
 		if err != nil {
 			return ctrl.Result{}, err
 		}
-		if err != nil || len(extensionHandlers) == 0 {
-			if err := hooks.MarkAsDone(ctx, r.Client, s.Current.Cluster, runtimehooksv1.BeforeClusterCreate); err != nil {
-				return ctrl.Result{}, err
-			}
+		if len(extensionHandlers) == 0 {
 			return ctrl.Result{}, nil
 		}
 
@@ -546,6 +543,18 @@ func (r *Reconciler) reconcileDelete(ctx context.Context, s *scope.Scope) (ctrl.
 	log := ctrl.LoggerFrom(ctx)
 	if feature.Gates.Enabled(feature.RuntimeSDK) {
 		if !hooks.IsOkToDelete(cluster) {
+			// Return quickly if the hook is not defined.
+			extensionHandlers, err := r.RuntimeClient.GetAllExtensions(ctx, runtimehooksv1.BeforeClusterDelete, s.Current.Cluster)
+			if err != nil {
+				return ctrl.Result{}, err
+			}
+			if len(extensionHandlers) == 0 {
+				if err := hooks.MarkAsOkToDelete(ctx, r.Client, cluster); err != nil {
+					return ctrl.Result{}, err
+				}
+				return ctrl.Result{}, nil
+			}
+
 			v1beta1Cluster := &clusterv1beta1.Cluster{}
 			// DeepCopy cluster because ConvertFrom has side effects like adding the conversion annotation.
 			if err := v1beta1Cluster.ConvertFrom(cluster.DeepCopy()); err != nil {
@@ -560,7 +569,7 @@ func (r *Reconciler) reconcileDelete(ctx context.Context, s *scope.Scope) (ctrl.
 				return ctrl.Result{}, err
 			}
 			// Add the response to the tracker so we can later update condition or requeue when required.
-			s.HookResponseTracker.Add(runtimehooksv1.BeforeClusterUpgrade, hookResponse)
+			s.HookResponseTracker.Add(runtimehooksv1.BeforeClusterDelete, hookResponse)
 
 			if hookResponse.RetryAfterSeconds != 0 {
 				log.Info(fmt.Sprintf("Cluster deletion is blocked by %q hook", runtimecatalog.HookName(runtimehooksv1.BeforeClusterDelete)))
@@ -571,6 +580,7 @@ func (r *Reconciler) reconcileDelete(ctx context.Context, s *scope.Scope) (ctrl.
 			if err := hooks.MarkAsOkToDelete(ctx, r.Client, cluster); err != nil {
 				return ctrl.Result{}, err
 			}
+			log.Info(fmt.Sprintf("Cluster deletion js unblocked by %s hook", runtimecatalog.HookName(runtimehooksv1.BeforeClusterDelete)))
 		}
 	}
 	return ctrl.Result{}, nil
diff --git a/internal/controllers/topology/cluster/cluster_controller_test.go b/internal/controllers/topology/cluster/cluster_controller_test.go
@@ -581,7 +581,10 @@ func TestClusterReconciler_reconcileDelete(t *testing.T) {
 			tt.cluster.Annotations[conversion.DataAnnotation] = "should be cleaned up"
 
 			fakeClient := fake.NewClientBuilder().WithObjects(tt.cluster).Build()
-			fakeRuntimeClient := fakeruntimeclient.NewRuntimeClientBuilder().
+			fakeRuntimeClient := (fakeruntimeclient.NewRuntimeClientBuilder().
+				WithGetAllExtensionResponses(map[runtimecatalog.GroupVersionHook][]string{
+					beforeClusterDeleteGVH: {"foo"},
+				})).
 				WithCallAllExtensionResponses(map[runtimecatalog.GroupVersionHook]runtimehooksv1.ResponseObject{
 					beforeClusterDeleteGVH: tt.hookResponse,
 				}).
@@ -609,7 +612,7 @@ func TestClusterReconciler_reconcileDelete(t *testing.T) {
 					g.Expect(fakeRuntimeClient.CallAllCount(runtimehooksv1.BeforeClusterDelete)).To(Equal(1), "Expected hook to be called once")
 					if !tt.wantOkToDelete {
 						g.Expect(s.HookResponseTracker.AggregateRetryAfter()).ToNot(BeZero())
-						g.Expect(s.HookResponseTracker.AggregateMessage()).To(Equal("Following hooks are blocking upgrade progress: BeforeClusterUpgrade: hook is blocking"))
+						g.Expect(s.HookResponseTracker.AggregateMessage("delete")).To(Equal("Following hooks are blocking delete: BeforeClusterDelete: hook is blocking"))
 					}
 				} else {
 					g.Expect(fakeRuntimeClient.CallAllCount(runtimehooksv1.BeforeClusterDelete)).To(Equal(0), "Did not expect hook to be called")
diff --git a/internal/controllers/topology/cluster/conditions.go b/internal/controllers/topology/cluster/conditions.go
@@ -104,7 +104,7 @@ func (r *Reconciler) reconcileTopologyReconciledCondition(s *scope.Scope, cluste
 	if !cluster.DeletionTimestamp.IsZero() {
 		message := "Cluster is deleting"
 		if s.HookResponseTracker.AggregateRetryAfter() != 0 {
-			message += ". " + strings.ReplaceAll(s.HookResponseTracker.AggregateMessage(), "upgrade", "delete")
+			message += ". " + s.HookResponseTracker.AggregateMessage("delete")
 		}
 		v1beta1conditions.Set(cluster,
 			v1beta1conditions.FalseCondition(
@@ -146,28 +146,6 @@ func (r *Reconciler) reconcileTopologyReconciledCondition(s *scope.Scope, cluste
 		return nil
 	}
 
-	// If the cluster is performing initial provisioning.
-	if s.Blueprint != nil && s.Blueprint.ClusterClass != nil &&
-		s.Blueprint.ClusterClass.GetGeneration() != s.Blueprint.ClusterClass.Status.ObservedGeneration {
-		v1beta1conditions.Set(cluster,
-			v1beta1conditions.FalseCondition(
-				clusterv1.TopologyReconciledV1Beta1Condition,
-				clusterv1.TopologyReconciledClusterClassNotReconciledV1Beta1Reason,
-				clusterv1.ConditionSeverityInfo,
-				"ClusterClass not reconciled. If this condition persists please check ClusterClass status. A ClusterClass is reconciled if"+
-					".status.observedGeneration == .metadata.generation is true. If this is not the case either ClusterClass reconciliation failed or the ClusterClass is paused",
-			),
-		)
-		conditions.Set(cluster, metav1.Condition{
-			Type:   clusterv1.ClusterTopologyReconciledCondition,
-			Status: metav1.ConditionFalse,
-			Reason: clusterv1.ClusterTopologyReconciledClusterClassNotReconciledReason,
-			Message: "ClusterClass not reconciled. If this condition persists please check ClusterClass status. A ClusterClass is reconciled if" +
-				".status.observedGeneration == .metadata.generation is true. If this is not the case either ClusterClass reconciliation failed or the ClusterClass is paused",
-		})
-		return nil
-	}
-
 	// If the BeforeClusterCreate hook is blocking, reports it
 	if !s.Current.Cluster.Spec.InfrastructureRef.IsDefined() && !s.Current.Cluster.Spec.ControlPlaneRef.IsDefined() {
 		if s.HookResponseTracker.AggregateRetryAfter() != 0 {
@@ -178,7 +156,7 @@ func (r *Reconciler) reconcileTopologyReconciledCondition(s *scope.Scope, cluste
 				Type:    clusterv1.ClusterTopologyReconciledCondition,
 				Status:  metav1.ConditionTrue,
 				Reason:  clusterv1.ClusterTopologyReconcileSucceededReason,
-				Message: strings.ReplaceAll(s.HookResponseTracker.AggregateMessage(), "upgrade progress", "Cluster topology creation"),
+				Message: s.HookResponseTracker.AggregateMessage("Cluster topology creation"),
 			})
 			return nil
 		}
@@ -192,6 +170,7 @@ func (r *Reconciler) reconcileTopologyReconciledCondition(s *scope.Scope, cluste
 			Status: metav1.ConditionTrue,
 			Reason: clusterv1.ClusterTopologyReconcileSucceededReason,
 		})
+		return nil
 	}
 
 	// If Cluster is updating surface it.
@@ -215,7 +194,7 @@ func (r *Reconciler) reconcileTopologyReconciledCondition(s *scope.Scope, cluste
 		// Setting condition reasons showing upgrade is progress; this will be overridden only
 		// when users are blocking upgrade to make further progress, e.g. deferred upgrades
 		reason := clusterv1.ClusterTopologyReconciledClusterUpgradingReason
-		v1Beta1Reason := clusterv1.ClusterTopologyReconciledClusterUpgradingV1Beta1Reason
+		v1Beta1Reason := clusterv1.TopologyReconciledClusterUpgradingV1Beta1Reason
 
 		cpVersion, err := contract.ControlPlane().Version().Get(s.Current.ControlPlane.Object)
 		if err != nil {
@@ -224,7 +203,7 @@ func (r *Reconciler) reconcileTopologyReconciledCondition(s *scope.Scope, cluste
 
 		// If any of the lifecycle hooks are blocking the upgrade surface it as a first detail.
 		if s.HookResponseTracker.IsAnyBlocking() {
-			fmt.Fprintf(msgBuilder, "\n  * %s", s.HookResponseTracker.AggregateMessage())
+			fmt.Fprintf(msgBuilder, "\n  * %s", s.HookResponseTracker.AggregateMessage("upgrade"))
 		}
 
 		// If control plane is upgrading surface it, otherwise surface the pending upgrade plan.
@@ -252,7 +231,7 @@ func (r *Reconciler) reconcileTopologyReconciledCondition(s *scope.Scope, cluste
 
 		// If MachineDeployments has been deferred or put on hold, surface it.
 		if len(deferredMachineDeploymentNames) > 0 {
-			fmt.Fprintf(msgBuilder, "\n  * %s upgrade to version %s deferred using topology.cluster.x-k8s.io/defer-upgrade or hold-upgrade-sequence annotations", nameList("MachineDeployment", "MachineDeployments", deferredMachineDeploymentNames), *cpVersion)
+			fmt.Fprintf(msgBuilder, "\n  * %s upgrade to version %s deferred using defer-upgrade or hold-upgrade-sequence annotations", nameList("MachineDeployment", "MachineDeployments", deferredMachineDeploymentNames), *cpVersion)
 			// If Deferred upgrades are blocking an upgrade, surface it.
 			// Note: Hook blocking takes the precedence on this signal.
 			if !s.HookResponseTracker.IsAnyBlocking() &&
@@ -360,7 +339,7 @@ func nameList(kind, kindPlural string, names []string) any {
 	sort.Strings(names)
 	switch {
 	case len(names) == 1:
-		return fmt.Sprintf("%s %s", kind, strings.Join(names, ", "))
+		return fmt.Sprintf("%s %s", kind, names[0])
 	case len(names) <= 3:
 		return fmt.Sprintf("%s %s", kindPlural, strings.Join(names, ", "))
 	default:
diff --git a/internal/controllers/topology/cluster/conditions_test.go b/internal/controllers/topology/cluster/conditions_test.go

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ func (h *HookResponseTracker) AggregateRetryAfter() time.Duration {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`// AggregateMessage returns a human friendly message about the blocking status of hooks.`
`84`		`-func (h *HookResponseTracker) AggregateMessage() string {`
	`84`	`+func (h *HookResponseTracker) AggregateMessage(action string) string {`
`85`	`85`	`blockingHooks := map[string]string{}`
`86`	`86`	`for hook, resp := range h.responses {`
`87`	`87`	`if retryResponse, ok := resp.(runtimehooksv1.RetryResponseObject); ok {`
`@@ -102,5 +102,5 @@ func (h *HookResponseTracker) AggregateMessage() string {`
`102`	`102`	`hookAndMessages = append(hookAndMessages, fmt.Sprintf("%s: %s", hook, message))`
`103`	`103`	`}`
`104`	`104`	`}`
`105`		`- return fmt.Sprintf("Following hooks are blocking upgrade progress: %s", strings.Join(hookAndMessages, "; "))`
	`105`	`+ return fmt.Sprintf("Following hooks are blocking %s: %s", action, strings.Join(hookAndMessages, "; "))`
`106`	`106`	`}`