⚠️ Add MinReadySeconds to Machine and remove it from MachineDeployment, MachineSet, MachinePool.

Makefile

@@ -921,6 +921,10 @@ test: $(SETUP_ENVTEST) ## Run unit and integration tests with race detector
 	# To achieve that, all files with fuzz tests have the "!race" build tag, to still run fuzz tests
 	# we have an additional `go test` run that focuses on "TestFuzzyConversion".
 	KUBEBUILDER_ASSETS="$(KUBEBUILDER_ASSETS)" go test -race ./... $(TEST_ARGS)
+	$(MAKE) test-conversions TEST_ARGS="$(TEST_ARGS)"
+
+.PHONY: test-conversions
+test-conversions: $(SETUP_ENVTEST) ## Run conversions test
 	KUBEBUILDER_ASSETS="$(KUBEBUILDER_ASSETS)" go test -run "^TestFuzzyConversion$$" ./... $(TEST_ARGS)
 
 .PHONY: test-verbose

api/v1beta1/conversion.go

@@ -21,9 +21,11 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	apimachineryconversion "k8s.io/apimachinery/pkg/conversion"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta2"
+	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 )
 
 func (src *Cluster) ConvertTo(dstRaw conversion.Hub) error {
@@ -53,37 +55,80 @@ func (dst *ClusterClass) ConvertFrom(srcRaw conversion.Hub) error {
 func (src *Machine) ConvertTo(dstRaw conversion.Hub) error {
 	dst := dstRaw.(*clusterv1.Machine)
 
-	return Convert_v1beta1_Machine_To_v1beta2_Machine(src, dst, nil)
+	if err := Convert_v1beta1_Machine_To_v1beta2_Machine(src, dst, nil); err != nil {
+		return err
+	}
+
+	restored := &clusterv1.Machine{}
+	if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok {
+		return err
+	}
+
+	dst.Spec.MinReadySeconds = restored.Spec.MinReadySeconds
+
+	return nil
 }
 
 func (dst *Machine) ConvertFrom(srcRaw conversion.Hub) error {
 	src := srcRaw.(*clusterv1.Machine)
 
-	return Convert_v1beta2_Machine_To_v1beta1_Machine(src, dst, nil)
+	if err := Convert_v1beta2_Machine_To_v1beta1_Machine(src, dst, nil); err != nil {
+		return err
+	}
+
+	return utilconversion.MarshalData(src, dst)
 }
 
 func (src *MachineSet) ConvertTo(dstRaw conversion.Hub) error {
 	dst := dstRaw.(*clusterv1.MachineSet)
 
-	return Convert_v1beta1_MachineSet_To_v1beta2_MachineSet(src, dst, nil)
+	if err := Convert_v1beta1_MachineSet_To_v1beta2_MachineSet(src, dst, nil); err != nil {
+		return err
+	}
+
+	if src.Spec.MinReadySeconds == 0 {
+		dst.Spec.Template.Spec.MinReadySeconds = nil
+	} else {
+		dst.Spec.Template.Spec.MinReadySeconds = &src.Spec.MinReadySeconds
+	}
+
+	return nil
 }
 
 func (dst *MachineSet) ConvertFrom(srcRaw conversion.Hub) error {
 	src := srcRaw.(*clusterv1.MachineSet)
 
-	return Convert_v1beta2_MachineSet_To_v1beta1_MachineSet(src, dst, nil)
+	if err := Convert_v1beta2_MachineSet_To_v1beta1_MachineSet(src, dst, nil); err != nil {
+		return err
+	}
+
+	dst.Spec.MinReadySeconds = ptr.Deref(src.Spec.Template.Spec.MinReadySeconds, 0)
+
+	return nil
 }
 
 func (src *MachineDeployment) ConvertTo(dstRaw conversion.Hub) error {
 	dst := dstRaw.(*clusterv1.MachineDeployment)
 
-	return Convert_v1beta1_MachineDeployment_To_v1beta2_MachineDeployment(src, dst, nil)
+	if err := Convert_v1beta1_MachineDeployment_To_v1beta2_MachineDeployment(src, dst, nil); err != nil {
+		return err
+	}
+
+	dst.Spec.Template.Spec.MinReadySeconds = src.Spec.MinReadySeconds
+
+	return nil
 }
 
 func (dst *MachineDeployment) ConvertFrom(srcRaw conversion.Hub) error {
 	src := srcRaw.(*clusterv1.MachineDeployment)
 
-	return Convert_v1beta2_MachineDeployment_To_v1beta1_MachineDeployment(src, dst, nil)
+	if err := Convert_v1beta2_MachineDeployment_To_v1beta1_MachineDeployment(src, dst, nil); err != nil {
+		return err
+	}
+
+	dst.Spec.MinReadySeconds = src.Spec.Template.Spec.MinReadySeconds
+
+	return nil
 }
 
 func (src *MachineHealthCheck) ConvertTo(dstRaw conversion.Hub) error {
@@ -710,3 +755,11 @@ func Convert_v1beta1_ClusterVariable_To_v1beta2_ClusterVariable(in *ClusterVaria
 	// because it was already not possible to set it anymore with v1beta1.
 	return autoConvert_v1beta1_ClusterVariable_To_v1beta2_ClusterVariable(in, out, s)
 }
+
+func Convert_v1beta1_MachineSetSpec_To_v1beta2_MachineSetSpec(in *MachineSetSpec, out *clusterv1.MachineSetSpec, s apimachineryconversion.Scope) error {
+	return autoConvert_v1beta1_MachineSetSpec_To_v1beta2_MachineSetSpec(in, out, s)
+}
+
+func Convert_v1beta2_MachineSpec_To_v1beta1_MachineSpec(in *clusterv1.MachineSpec, out *MachineSpec, s apimachineryconversion.Scope) error {
+	return autoConvert_v1beta2_MachineSpec_To_v1beta1_MachineSpec(in, out, s)
+}

api/v1beta1/machine_types.go

@@ -424,14 +424,6 @@ type MachineSpec struct {
 	// +kubebuilder:validation:MaxLength=256
 	FailureDomain *string `json:"failureDomain,omitempty"`
 
-	// The minimum number of seconds for which a Machine should be ready before considering it available.
-	// Defaults to 0 (Machine will be considered available as soon as the Machine is ready)
-	// NOTE: this field will be considered only for computing v1beta2 conditions.
-	// +optional
-	// TODO: This field will be added in the v1beta2 API, and act as a replacement of existing MinReadySeconds in
-	//  MachineDeployment, MachineSet and MachinePool
-	// MinReadySeconds int32 `json:"minReadySeconds,omitempty"`
-
 	// readinessGates specifies additional conditions to include when evaluating Machine Ready condition.
 	//
 	// This field can be used e.g. by Cluster API control plane providers to extend the semantic of the

api/v1beta2/machine_types.go

@@ -424,13 +424,10 @@ type MachineSpec struct {
 	// +kubebuilder:validation:MaxLength=256
 	FailureDomain *string `json:"failureDomain,omitempty"`
 
-	// The minimum number of seconds for which a Machine should be ready before considering it available.
+	// minReadySeconds is the minimum number of seconds for which a Machine should be ready before considering it available.
 	// Defaults to 0 (Machine will be considered available as soon as the Machine is ready)
-	// NOTE: this field will be considered only for computing v1beta2 conditions.
 	// +optional
-	// TODO: This field will be added in the v1beta2 API, and act as a replacement of existing MinReadySeconds in
-	//  MachineDeployment, MachineSet and MachinePool
-	// MinReadySeconds int32 `json:"minReadySeconds,omitempty"`
+	MinReadySeconds *int32 `json:"minReadySeconds,omitempty"`
 
 	// readinessGates specifies additional conditions to include when evaluating Machine Ready condition.
 	//

api/v1beta2/machinedeployment_types.go

@@ -295,11 +295,6 @@ type MachineDeploymentSpec struct {
 	// +optional
 	MachineNamingStrategy *MachineNamingStrategy `json:"machineNamingStrategy,omitempty"`
 
-	// minReadySeconds is the minimum number of seconds for which a Node for a newly created machine should be ready before considering the replica available.
-	// Defaults to 0 (machine will be considered available as soon as the Node is ready)
-	// +optional
-	MinReadySeconds *int32 `json:"minReadySeconds,omitempty"`
-
 	// revisionHistoryLimit is the number of old MachineSets to retain to allow rollback.
 	// This is a pointer to distinguish between explicit zero and not specified.
 	// Defaults to 1.

api/v1beta2/machineset_types.go

@@ -65,11 +65,6 @@ type MachineSetSpec struct {
 	// +optional
 	Replicas *int32 `json:"replicas,omitempty"`
 
-	// minReadySeconds is the minimum number of seconds for which a Node for a newly created machine should be ready before considering the replica available.
-	// Defaults to 0 (machine will be considered available as soon as the Node is ready)
-	// +optional
-	MinReadySeconds int32 `json:"minReadySeconds,omitempty"`
-
 	// deletePolicy defines the policy used to identify nodes to delete when downscaling.
 	// Defaults to "Random".  Valid values are "Random, "Newest", "Oldest"
 	// +kubebuilder:validation:Enum=Random;Newest;Oldest