add NodeVolumeDetachTimeout to MachineDeploymentTopology

Author: Yuvaraj Kakaraparthi

api/v1alpha4/conversion.go

@@ -63,6 +63,7 @@ func (src *Cluster) ConvertTo(dstRaw conversion.Hub) error {
 				dst.Spec.Topology.Workers.MachineDeployments[i].FailureDomain = restored.Spec.Topology.Workers.MachineDeployments[i].FailureDomain
 				dst.Spec.Topology.Workers.MachineDeployments[i].Variables = restored.Spec.Topology.Workers.MachineDeployments[i].Variables
 				dst.Spec.Topology.Workers.MachineDeployments[i].NodeDrainTimeout = restored.Spec.Topology.Workers.MachineDeployments[i].NodeDrainTimeout
+				dst.Spec.Topology.Workers.MachineDeployments[i].NodeVolumeDetachTimeout = restored.Spec.Topology.Workers.MachineDeployments[i].NodeVolumeDetachTimeout
 				dst.Spec.Topology.Workers.MachineDeployments[i].NodeDeletionTimeout = restored.Spec.Topology.Workers.MachineDeployments[i].NodeDeletionTimeout
 			}
 		}

api/v1alpha4/zz_generated.conversion.go

@@ -178,6 +178,11 @@ type MachineDeploymentTopology struct {
 	// +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 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.
 	// Defaults to 10 seconds.

api/v1beta1/cluster_types.go

@@ -545,13 +545,14 @@ func computeMachineDeployment(_ context.Context, s *scope.Scope, desiredControlP
 					Annotations: mergeMap(machineDeploymentTopology.Metadata.Annotations, machineDeploymentBlueprint.Metadata.Annotations),
 				},
 				Spec: clusterv1.MachineSpec{
-					ClusterName:         s.Current.Cluster.Name,
-					Version:             pointer.String(version),
-					Bootstrap:           clusterv1.Bootstrap{ConfigRef: contract.ObjToRef(desiredMachineDeployment.BootstrapTemplate)},
-					InfrastructureRef:   *contract.ObjToRef(desiredMachineDeployment.InfrastructureMachineTemplate),
-					FailureDomain:       machineDeploymentTopology.FailureDomain,
-					NodeDrainTimeout:    machineDeploymentTopology.NodeDrainTimeout,
-					NodeDeletionTimeout: machineDeploymentTopology.NodeDeletionTimeout,
+					ClusterName:             s.Current.Cluster.Name,
+					Version:                 pointer.String(version),
+					Bootstrap:               clusterv1.Bootstrap{ConfigRef: contract.ObjToRef(desiredMachineDeployment.BootstrapTemplate)},
+					InfrastructureRef:       *contract.ObjToRef(desiredMachineDeployment.InfrastructureMachineTemplate),
+					FailureDomain:           machineDeploymentTopology.FailureDomain,
+					NodeDrainTimeout:        machineDeploymentTopology.NodeDrainTimeout,
+					NodeVolumeDetachTimeout: machineDeploymentTopology.NodeVolumeDetachTimeout,
+					NodeDeletionTimeout:     machineDeploymentTopology.NodeDeletionTimeout,
 				},
 			},
 		},

api/v1beta1/zz_generated.deepcopy.go

@@ -1324,17 +1324,19 @@ func TestComputeMachineDeployment(t *testing.T) {
 	replicas := int32(5)
 	failureDomain := "always-up-region"
 	nodeDrainTimeout := metav1.Duration{Duration: 10 * time.Second}
+	nodeVolumeDetachTimeout := metav1.Duration{Duration: 10 * time.Second}
 	nodeDeletionTimeout := metav1.Duration{Duration: 10 * time.Second}
 	mdTopology := clusterv1.MachineDeploymentTopology{
 		Metadata: clusterv1.ObjectMeta{
 			Labels: map[string]string{"foo": "baz"},
 		},
-		Class:               "linux-worker",
-		Name:                "big-pool-of-machines",
-		Replicas:            &replicas,
-		FailureDomain:       &failureDomain,
-		NodeDrainTimeout:    &nodeDrainTimeout,
-		NodeDeletionTimeout: &nodeDeletionTimeout,
+		Class:                   "linux-worker",
+		Name:                    "big-pool-of-machines",
+		Replicas:                &replicas,
+		FailureDomain:           &failureDomain,
+		NodeDrainTimeout:        &nodeDrainTimeout,
+		NodeVolumeDetachTimeout: &nodeVolumeDetachTimeout,
+		NodeDeletionTimeout:     &nodeDeletionTimeout,
 	}
 
 	t.Run("Generates the machine deployment and the referenced templates", func(t *testing.T) {