Add fields for controlplane node deletion controller (#854)

Signed-off-by: Adrian Pedriza <[email protected]>
Co-authored-by: Adrian Pedriza <[email protected]>

api/controlplane/v1beta1/k0s_types.go

@@ -95,6 +95,23 @@ type K0sControlPlaneMachineTemplate struct {
 	// InfrastructureRef is a required reference to a custom resource
 	// offered by an infrastructure provider.
 	InfrastructureRef corev1.ObjectReference `json:"infrastructureRef"`
+
+	// NodeDrainTimeout is the total amount of time that the controller will spend on draining a controlplane node
+	// The default value is 0, meaning that the node can be drained without any time limitations.
+	// NOTE: NodeDrainTimeout is different from `kubectl drain --timeout`
+	// +optional
+	NodeDrainTimeout *metav1.Duration `json:"nodeDrainTimeout,omitempty"`
+
+	// NodeVolumeDetachTimeout is the total amount of time that the controller will spend on waiting for all volumes
+	// to be detached. The default value is 0, meaning that the volumes can be detached without any time limitations.
+	// +optional
+	NodeVolumeDetachTimeout *metav1.Duration `json:"nodeVolumeDetachTimeout,omitempty"`
+
+	// NodeDeletionTimeout defines how long the machine controller will attempt to delete the Node that the Machine
+	// hosts after the Machine is marked for deletion. A duration of 0 will retry deletion indefinitely.
+	// If no value is provided, the default value for this property of the Machine resource will be used.
+	// +optional
+	NodeDeletionTimeout *metav1.Duration `json:"nodeDeletionTimeout,omitempty"`
 }
 
 // +kubebuilder:object:root=true

config/clusterapi/controlplane/bases/controlplane.cluster.x-k8s.io_k0scontrolplanes.yaml

@@ -282,6 +282,23 @@ spec:
                           More info: http://kubernetes.io/docs/user-guide/labels
                         type: object
                     type: object
+                  nodeDeletionTimeout:
+                    description: |-
+                      NodeDeletionTimeout defines how long the machine controller will attempt to delete the Node that the Machine
+                      hosts after the Machine is marked for deletion. A duration of 0 will retry deletion indefinitely.
+                      If no value is provided, the default value for this property of the Machine resource will be used.
+                    type: string
+                  nodeDrainTimeout:
+                    description: |-
+                      NodeDrainTimeout is the total amount of time that the controller will spend on draining a controlplane node
+                      The default value is 0, meaning that the node can be drained without any time limitations.
+                      NOTE: NodeDrainTimeout is different from `kubectl drain --timeout`
+                    type: string
+                  nodeVolumeDetachTimeout:
+                    description: |-
+                      NodeVolumeDetachTimeout is the total amount of time that the controller will spend on waiting for all volumes
+                      to be detached. The default value is 0, meaning that the volumes can be detached without any time limitations.
+                    type: string
                 required:
                 - infrastructureRef
                 type: object

config/clusterapi/controlplane/bases/controlplane.cluster.x-k8s.io_k0scontrolplanetemplates.yaml

@@ -265,6 +265,23 @@ spec:
                                   More info: http://kubernetes.io/docs/user-guide/labels
                                 type: object
                             type: object
+                          nodeDeletionTimeout:
+                            description: |-
+                              NodeDeletionTimeout defines how long the machine controller will attempt to delete the Node that the Machine
+                              hosts after the Machine is marked for deletion. A duration of 0 will retry deletion indefinitely.
+                              If no value is provided, the default value for this property of the Machine resource will be used.
+                            type: string
+                          nodeDrainTimeout:
+                            description: |-
+                              NodeDrainTimeout is the total amount of time that the controller will spend on draining a controlplane node
+                              The default value is 0, meaning that the node can be drained without any time limitations.
+                              NOTE: NodeDrainTimeout is different from `kubectl drain --timeout`
+                            type: string
+                          nodeVolumeDetachTimeout:
+                            description: |-
+                              NodeVolumeDetachTimeout is the total amount of time that the controller will spend on waiting for all volumes
+                              to be detached. The default value is 0, meaning that the volumes can be detached without any time limitations.
+                            type: string
                         required:
                         - infrastructureRef
                         type: object

config/crd/bases/controlplane.cluster.x-k8s.io_k0scontrolplanes.yaml

@@ -282,6 +282,23 @@ spec:
                           More info: http://kubernetes.io/docs/user-guide/labels
                         type: object
                     type: object
+                  nodeDeletionTimeout:
+                    description: |-
+                      NodeDeletionTimeout defines how long the machine controller will attempt to delete the Node that the Machine
+                      hosts after the Machine is marked for deletion. A duration of 0 will retry deletion indefinitely.
+                      If no value is provided, the default value for this property of the Machine resource will be used.
+                    type: string
+                  nodeDrainTimeout:
+                    description: |-
+                      NodeDrainTimeout is the total amount of time that the controller will spend on draining a controlplane node
+                      The default value is 0, meaning that the node can be drained without any time limitations.
+                      NOTE: NodeDrainTimeout is different from `kubectl drain --timeout`
+                    type: string
+                  nodeVolumeDetachTimeout:
+                    description: |-
+                      NodeVolumeDetachTimeout is the total amount of time that the controller will spend on waiting for all volumes
+                      to be detached. The default value is 0, meaning that the volumes can be detached without any time limitations.
+                    type: string
                 required:
                 - infrastructureRef
                 type: object

config/crd/bases/controlplane.cluster.x-k8s.io_k0scontrolplanetemplates.yaml

@@ -265,6 +265,23 @@ spec:
                                   More info: http://kubernetes.io/docs/user-guide/labels
                                 type: object
                             type: object
+                          nodeDeletionTimeout:
+                            description: |-
+                              NodeDeletionTimeout defines how long the machine controller will attempt to delete the Node that the Machine
+                              hosts after the Machine is marked for deletion. A duration of 0 will retry deletion indefinitely.
+                              If no value is provided, the default value for this property of the Machine resource will be used.
+                            type: string
+                          nodeDrainTimeout:
+                            description: |-
+                              NodeDrainTimeout is the total amount of time that the controller will spend on draining a controlplane node
+                              The default value is 0, meaning that the node can be drained without any time limitations.
+                              NOTE: NodeDrainTimeout is different from `kubectl drain --timeout`
+                            type: string
+                          nodeVolumeDetachTimeout:
+                            description: |-
+                              NodeVolumeDetachTimeout is the total amount of time that the controller will spend on waiting for all volumes
+                              to be detached. The default value is 0, meaning that the volumes can be detached without any time limitations.
+                            type: string
                         required:
                         - infrastructureRef
                         type: object

docs/resource-reference.md

@@ -1703,6 +1703,32 @@ offered by an infrastructure provider.<br/>
 More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata<br/>
         </td>
         <td>false</td>
+      </tr><tr>
+        <td><b>nodeDeletionTimeout</b></td>
+        <td>string</td>
+        <td>
+          NodeDeletionTimeout defines how long the machine controller will attempt to delete the Node that the Machine
+hosts after the Machine is marked for deletion. A duration of 0 will retry deletion indefinitely.
+If no value is provided, the default value for this property of the Machine resource will be used.<br/>
+        </td>
+        <td>false</td>
+      </tr><tr>
+        <td><b>nodeDrainTimeout</b></td>
+        <td>string</td>
+        <td>
+          NodeDrainTimeout is the total amount of time that the controller will spend on draining a controlplane node
+The default value is 0, meaning that the node can be drained without any time limitations.
+NOTE: NodeDrainTimeout is different from `kubectl drain --timeout`<br/>
+        </td>
+        <td>false</td>
+      </tr><tr>
+        <td><b>nodeVolumeDetachTimeout</b></td>
+        <td>string</td>
+        <td>
+          NodeVolumeDetachTimeout is the total amount of time that the controller will spend on waiting for all volumes
+to be detached. The default value is 0, meaning that the volumes can be detached without any time limitations.<br/>
+        </td>
+        <td>false</td>
       </tr></tbody>
 </table>
 
@@ -2562,6 +2588,32 @@ offered by an infrastructure provider.<br/>
 More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata<br/>
         </td>
         <td>false</td>
+      </tr><tr>
+        <td><b>nodeDeletionTimeout</b></td>
+        <td>string</td>
+        <td>
+          NodeDeletionTimeout defines how long the machine controller will attempt to delete the Node that the Machine
+hosts after the Machine is marked for deletion. A duration of 0 will retry deletion indefinitely.
+If no value is provided, the default value for this property of the Machine resource will be used.<br/>
+        </td>
+        <td>false</td>
+      </tr><tr>
+        <td><b>nodeDrainTimeout</b></td>
+        <td>string</td>
+        <td>
+          NodeDrainTimeout is the total amount of time that the controller will spend on draining a controlplane node
+The default value is 0, meaning that the node can be drained without any time limitations.
+NOTE: NodeDrainTimeout is different from `kubectl drain --timeout`<br/>
+        </td>
+        <td>false</td>
+      </tr><tr>
+        <td><b>nodeVolumeDetachTimeout</b></td>
+        <td>string</td>
+        <td>
+          NodeVolumeDetachTimeout is the total amount of time that the controller will spend on waiting for all volumes
+to be detached. The default value is 0, meaning that the volumes can be detached without any time limitations.<br/>
+        </td>
+        <td>false</td>
       </tr></tbody>
 </table>
 

internal/controller/controlplane/helper.go

@@ -123,7 +123,10 @@ func (c *K0sController) generateMachine(_ context.Context, name string, cluster
 					Name:       name,
 				},
 			},
-			InfrastructureRef: infraRef,
+			InfrastructureRef:       infraRef,
+			NodeDrainTimeout:        kcp.Spec.MachineTemplate.NodeDrainTimeout,
+			NodeDeletionTimeout:     kcp.Spec.MachineTemplate.NodeDeletionTimeout,
+			NodeVolumeDetachTimeout: kcp.Spec.MachineTemplate.NodeVolumeDetachTimeout,
 		},
 	}