Address comments

Author: fabriziopandini

exp/topology/scope/hookresponsetracker_test.go

@@ -164,7 +164,7 @@ func TestHookResponseTracker_IsBlocking(t *testing.T) {
 		},
 	}
 
-	afterClusterUpgradeResponse := &runtimehooksv1.AfterControlPlaneInitializedResponse{
+	afterAfterControlPlaneInitializedResponse := &runtimehooksv1.AfterControlPlaneInitializedResponse{
 		CommonResponse: runtimehooksv1.CommonResponse{},
 	}
 
@@ -195,8 +195,8 @@ func TestHookResponseTracker_IsBlocking(t *testing.T) {
 	t.Run("should return false if the hook is non-blocking", func(t *testing.T) {
 		g := NewWithT(t)
 		hrt := NewHookResponseTracker()
-		// AfterClusterUpgradeHook is non-blocking.
-		hrt.Add(runtimehooksv1.AfterClusterUpgrade, afterClusterUpgradeResponse)
-		g.Expect(hrt.IsBlocking(runtimehooksv1.AfterClusterUpgrade)).To(BeFalse())
+		// AfterControlPlaneInitialized is non-blocking.
+		hrt.Add(runtimehooksv1.AfterControlPlaneInitialized, afterAfterControlPlaneInitializedResponse)
+		g.Expect(hrt.IsBlocking(runtimehooksv1.AfterControlPlaneInitialized)).To(BeFalse())
 	})
 }

internal/webhooks/cluster.go

@@ -440,15 +440,6 @@ func (webhook *Cluster) validateTopologyVersionUpdate(ctx context.Context, fldPa
 		return nil
 	}
 
-	// Cannot upgrade when lifecycle hooks are still being completed for the previous upgrade.
-	if IsPending(runtimehooksv1.AfterClusterUpgrade, newCluster) {
-		return field.Invalid(
-			fldPath,
-			fldValue,
-			fmt.Sprintf("version cannot be change when the %q hook is still blocking", runtimecatalog.HookName(runtimehooksv1.AfterClusterUpgrade)),
-		)
-	}
-
 	// Version could only be increased.
 	if inVersion.NE(semver.Version{}) && oldVersion.NE(semver.Version{}) && version.Compare(inVersion, oldVersion, version.WithoutPreReleases()) < 0 {
 		return field.Invalid(
@@ -474,6 +465,15 @@ func (webhook *Cluster) validateTopologyVersionUpdate(ctx context.Context, fldPa
 		}
 	}
 
+	// Cannot upgrade when lifecycle hooks are still being completed for the previous upgrade.
+	if IsPending(runtimehooksv1.AfterClusterUpgrade, newCluster) {
+		return field.Invalid(
+			fldPath,
+			fldValue,
+			fmt.Sprintf("version cannot be changed when the %q hook is still blocking", runtimecatalog.HookName(runtimehooksv1.AfterClusterUpgrade)),
+		)
+	}
+
 	allErrs := []error{}
 	// minor version cannot be increased if control plane is upgrading or not yet on the current version
 	if err := validateTopologyControlPlaneVersion(ctx, webhook.Client, oldCluster, oldVersion); err != nil {