Skip to content

Commit 9f9da49

Browse files
committed
Fix lint
Signed-off-by: Lubron Zhan <[email protected]>
1 parent c3c360a commit 9f9da49

File tree

7 files changed

+27
-20
lines changed

7 files changed

+27
-20
lines changed

api/v1beta1/zz_generated.conversion.go

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v1beta2/cluster_types.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -587,12 +587,13 @@ type Topology struct {
587587
Variables []ClusterVariable `json:"variables,omitempty"`
588588

589589
// nodeDeletionStrategy specifies the strategy to delete nodes in the cluster.
590-
// Avilable options:
590+
// Available options:
591591
// - graceful
592592
// - force
593-
// By default it's "force"
593+
// By default it's "force".
594594
// +optional
595-
NodeDeletionStrategy *NodeDrainStrategyType `json:"nodeDrainStrategy,omitempty"`
595+
// +kubebuilder:validation:Enum=force;graceful
596+
NodeDeletionStrategy *NodeDeletionStrategyType `json:"nodeDeletionStrategy,omitempty"`
596597
}
597598

598599
// ControlPlaneTopology specifies the parameters for the control plane nodes in the cluster.
@@ -909,11 +910,14 @@ type MachinePoolVariables struct {
909910
Overrides []ClusterVariable `json:"overrides,omitempty"`
910911
}
911912

912-
type NodeDrainStrategyType string
913+
// NodeDeletionStrategyType defines type of NodeDeletionStrategy.
914+
type NodeDeletionStrategyType string
913915

914916
const (
915-
NodeDrainStrategyForce NodeDrainStrategyType = "force"
916-
NodeDrainStrategyGracefulWithTimeout NodeDrainStrategyType = "gracefulWithTimeout"
917+
// NodeDeletionStrategyForce defines a force type strategy that node will be deleted immediately without drain.
918+
NodeDeletionStrategyForce NodeDeletionStrategyType = "force"
919+
// NodeDeletionStrategyTypeGracefulWithTimeout defines a force type strategy that node will be deleted with drain.
920+
NodeDeletionStrategyGracefulWithTimeout NodeDeletionStrategyType = "gracefulWithTimeout"
917921
)
918922

919923
// ANCHOR_END: ClusterSpec

api/v1beta2/zz_generated.deepcopy.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v1beta2/zz_generated.openapi.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/cluster.x-k8s.io_clusters.yaml

Lines changed: 6 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/controllers/machine/machine_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ func (r *Reconciler) nodeVolumeDetachTimeoutExceeded(machine *clusterv1.Machine)
715715
func (r *Reconciler) isDeleteNodeAllowed(ctx context.Context, cluster *clusterv1.Cluster, machine *clusterv1.Machine) error {
716716
log := ctrl.LoggerFrom(ctx)
717717
// Return early if the cluster is being deleted and cluster's nodeDeletionStrategy is not set or set to `force`.
718-
if !cluster.DeletionTimestamp.IsZero() && (cluster.Spec.Topology.NodeDeletionStrategy == nil || *cluster.Spec.Topology.NodeDeletionStrategy == clusterv1.NodeDrainStrategyForce) {
718+
if !cluster.DeletionTimestamp.IsZero() && (cluster.Spec.Topology.NodeDeletionStrategy == nil || *cluster.Spec.Topology.NodeDeletionStrategy == clusterv1.NodeDeletionStrategyForce) {
719719
return errClusterIsBeingDeleted
720720
}
721721

internal/controllers/machine/machine_controller_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2679,7 +2679,7 @@ func TestIsDeleteNodeAllowed(t *testing.T) {
26792679
},
26802680
Spec: clusterv1.ClusterSpec{
26812681
Topology: &clusterv1.Topology{
2682-
NodeDeletionStrategy: ptr.To(clusterv1.NodeDrainStrategyForce),
2682+
NodeDeletionStrategy: ptr.To(clusterv1.NodeDeletionStrategyForce),
26832683
},
26842684
},
26852685
},
@@ -2695,7 +2695,7 @@ func TestIsDeleteNodeAllowed(t *testing.T) {
26952695
},
26962696
Spec: clusterv1.ClusterSpec{
26972697
Topology: &clusterv1.Topology{
2698-
NodeDeletionStrategy: ptr.To(clusterv1.NodeDrainStrategyForce),
2698+
NodeDeletionStrategy: ptr.To(clusterv1.NodeDeletionStrategyForce),
26992699
},
27002700
},
27012701
},

0 commit comments

Comments
 (0)