Added nodeVolumeDetachTimeout to CP machine

Added UT's
kubernetes-sigs · Feb 7, 2023 · c8a9a50 · c8a9a50
1 parent c9dec31
commit c8a9a50
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/controlplane/kubeadm/internal/controllers/helpers.go b/controlplane/kubeadm/internal/controllers/helpers.go
@@ -307,13 +307,12 @@ func (r *KubeadmControlPlaneReconciler) generateMachine(ctx context.Context, kcp
 			Bootstrap: clusterv1.Bootstrap{
 				ConfigRef: bootstrapRef,
 			},
-			FailureDomain:    failureDomain,
-			NodeDrainTimeout: kcp.Spec.MachineTemplate.NodeDrainTimeout,
+			FailureDomain:           failureDomain,
+			NodeDrainTimeout:        kcp.Spec.MachineTemplate.NodeDrainTimeout,
+			NodeDeletionTimeout:     kcp.Spec.MachineTemplate.NodeDeletionTimeout,
+			NodeVolumeDetachTimeout: kcp.Spec.MachineTemplate.NodeVolumeDetachTimeout,
 		},
 	}
-	if kcp.Spec.MachineTemplate.NodeDeletionTimeout != nil {
-		machine.Spec.NodeDeletionTimeout = kcp.Spec.MachineTemplate.NodeDeletionTimeout
-	}
 
 	// Machine's bootstrap config may be missing ClusterConfiguration if it is not the first machine in the control plane.
 	// We store ClusterConfiguration as annotation here to detect any changes in KCP ClusterConfiguration and rollout the machine if any.

diff --git a/controlplane/kubeadm/internal/controllers/helpers_test.go b/controlplane/kubeadm/internal/controllers/helpers_test.go
@@ -18,6 +18,7 @@ package controllers
 
 import (
 	"testing"
+	"time"
 
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
@@ -515,7 +516,10 @@ func TestKubeadmControlPlaneReconciler_generateMachine(t *testing.T) {
 		Spec: controlplanev1.KubeadmControlPlaneSpec{
 			Version: "v1.16.6",
 			MachineTemplate: controlplanev1.KubeadmControlPlaneMachineTemplate{
-				ObjectMeta: kcpMachineTemplateObjectMeta,
+				ObjectMeta:              kcpMachineTemplateObjectMeta,
+				NodeVolumeDetachTimeout: &metav1.Duration{Duration: 10 * time.Second},
+				NodeDeletionTimeout:     &metav1.Duration{Duration: 10 * time.Second},
+				NodeDrainTimeout:        &metav1.Duration{Duration: 10 * time.Second},
 			},
 		},
 	}
@@ -538,7 +542,10 @@ func TestKubeadmControlPlaneReconciler_generateMachine(t *testing.T) {
 		Bootstrap: clusterv1.Bootstrap{
 			ConfigRef: bootstrapRef.DeepCopy(),
 		},
-		InfrastructureRef: *infraRef.DeepCopy(),
+		InfrastructureRef:       *infraRef.DeepCopy(),
+		NodeVolumeDetachTimeout: &metav1.Duration{Duration: 10 * time.Second},
+		NodeDeletionTimeout:     &metav1.Duration{Duration: 10 * time.Second},
+		NodeDrainTimeout:        &metav1.Duration{Duration: 10 * time.Second},
 	}
 	r := &KubeadmControlPlaneReconciler{
 		Client:            fakeClient,