Resolve comments

Signed-off-by: Lubron Zhan <[email protected]>

Author: lubronzhan

api/v1beta2/cluster_types.go

@@ -587,13 +587,13 @@ type Topology struct {
 	Variables []ClusterVariable `json:"variables,omitempty"`
 
 	// nodeDeletionStrategy specifies the strategy to delete nodes in the cluster.
-	// Available options:
-	// - graceful
-	// - force
-	// By default it's "force".
+	// Valid values are Force, Graceful and omitted.
+	// When omitted, the default behaviour will be Force.
+	// Graceful means that nodes will be deleted with drain.
+	// Force means that nodes will be deleted immediately without drain.
 	// +optional
 	// +kubebuilder:validation:Enum=force;graceful
-	NodeDeletionStrategy *NodeDeletionStrategyType `json:"nodeDeletionStrategy,omitempty"`
+	NodeDeletionStrategy NodeDeletionStrategyType `json:"nodeDeletionStrategy,omitempty"`
 }
 
 // ControlPlaneTopology specifies the parameters for the control plane nodes in the cluster.
@@ -915,9 +915,9 @@ type NodeDeletionStrategyType string
 
 const (
 	// NodeDeletionStrategyForce defines a force type strategy that node will be deleted immediately without drain.
-	NodeDeletionStrategyForce NodeDeletionStrategyType = "force"
-	// NodeDeletionStrategyGracefulWithTimeout defines a force type strategy that node will be deleted with drain.
-	NodeDeletionStrategyGracefulWithTimeout NodeDeletionStrategyType = "gracefulWithTimeout"
+	NodeDeletionStrategyForce NodeDeletionStrategyType = "Force"
+	// NodeDeletionStrategyGraceful defines a graceful type strategy that node will be deleted with drain.
+	NodeDeletionStrategyGraceful NodeDeletionStrategyType = "Graceful"
 )
 
 // ANCHOR_END: ClusterSpec

api/v1beta2/zz_generated.deepcopy.go

@@ -715,7 +715,7 @@ func (r *Reconciler) nodeVolumeDetachTimeoutExceeded(machine *clusterv1.Machine)
 func (r *Reconciler) isDeleteNodeAllowed(ctx context.Context, cluster *clusterv1.Cluster, machine *clusterv1.Machine) error {
 	log := ctrl.LoggerFrom(ctx)
 	// Return early if the cluster is being deleted and cluster's nodeDeletionStrategy is not set or set to `force`.
-	if !cluster.DeletionTimestamp.IsZero() && (cluster.Spec.Topology == nil || cluster.Spec.Topology.NodeDeletionStrategy == nil || *cluster.Spec.Topology.NodeDeletionStrategy == clusterv1.NodeDeletionStrategyForce) {
+	if !cluster.DeletionTimestamp.IsZero() && (cluster.Spec.Topology == nil || cluster.Spec.Topology.NodeDeletionStrategy == clusterv1.NodeDeletionStrategyForce) {
 		return errClusterIsBeingDeleted
 	}
 

api/v1beta2/zz_generated.openapi.go

@@ -2682,7 +2682,7 @@ func TestIsDeleteNodeAllowed(t *testing.T) {
 				},
 				Spec: clusterv1.ClusterSpec{
 					Topology: &clusterv1.Topology{
-						NodeDeletionStrategy: ptr.To(clusterv1.NodeDeletionStrategyForce),
+						NodeDeletionStrategy: clusterv1.NodeDeletionStrategyForce,
 					},
 				},
 			},
@@ -2698,7 +2698,7 @@ func TestIsDeleteNodeAllowed(t *testing.T) {
 				},
 				Spec: clusterv1.ClusterSpec{
 					Topology: &clusterv1.Topology{
-						NodeDeletionStrategy: ptr.To(clusterv1.NodeDeletionStrategyForce),
+						NodeDeletionStrategy: clusterv1.NodeDeletionStrategyForce,
 					},
 				},
 			},