Merge pull request #12232 from sbueringer/pr-remove-md-progress-deadline

⚠️ Remove MD spec.progressDeadlineSeconds

Author: k8s-ci-robot

.golangci.yml

@@ -245,10 +245,6 @@ linters:
       - linters:
           - staticcheck
         text: 'SA1019: ((deployment|m|md).Spec.RevisionHistoryLimit|clusterv1.RevisionHistoryAnnotation|c.RolloutUndo) is deprecated'
-        # Deprecations for MD revision management
-      - linters:
-          - staticcheck
-        text: 'SA1019: (m|md).Spec.ProgressDeadlineSeconds is deprecated: This field is deprecated and is going to be removed in the next apiVersion. Please see https://github.com/kubernetes-sigs/cluster-api/issues/11470 for more details.'
         # Deprecations for MHC MaxUnhealthy, UnhealthyRange
       - linters:
           - staticcheck

api/v1beta1/conversion.go

@@ -359,6 +359,11 @@ func Convert_v1beta2_Topology_To_v1beta1_Topology(in *clusterv1.Topology, out *T
 	return nil
 }
 
+func Convert_v1beta1_MachineDeploymentSpec_To_v1beta2_MachineDeploymentSpec(in *MachineDeploymentSpec, out *clusterv1.MachineDeploymentSpec, s apimachineryconversion.Scope) error {
+	// NOTE: v1beta2 MachineDeploymentSpec does not have ProgressDeadlineSeconds anymore. But it's fine to just lose this field it was never used.
+	return autoConvert_v1beta1_MachineDeploymentSpec_To_v1beta2_MachineDeploymentSpec(in, out, s)
+}
+
 func Convert_v1beta2_MachineDeploymentStatus_To_v1beta1_MachineDeploymentStatus(in *clusterv1.MachineDeploymentStatus, out *MachineDeploymentStatus, s apimachineryconversion.Scope) error {
 	if err := autoConvert_v1beta2_MachineDeploymentStatus_To_v1beta1_MachineDeploymentStatus(in, out, s); err != nil {
 		return err

api/v1beta1/conversion_test.go

@@ -290,6 +290,7 @@ func spokeMachineSetStatus(in *MachineSetStatus, c fuzz.Continue) {
 func MachineDeploymentFuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {
 	return []interface{}{
 		hubMachineDeploymentStatus,
+		spokeMachineDeploymentSpec,
 		spokeMachineDeploymentStatus,
 	}
 }
@@ -305,6 +306,13 @@ func hubMachineDeploymentStatus(in *clusterv1.MachineDeploymentStatus, c fuzz.Co
 	}
 }
 
+func spokeMachineDeploymentSpec(in *MachineDeploymentSpec, c fuzz.Continue) {
+	c.FuzzNoCustom(in)
+
+	// Drop ProgressDeadlineSeconds as we intentionally don't preserve it.
+	in.ProgressDeadlineSeconds = nil
+}
+
 func spokeMachineDeploymentStatus(in *MachineDeploymentStatus, c fuzz.Continue) {
 	c.FuzzNoCustom(in)
 	// Drop empty structs with only omit empty fields.

api/v1beta1/zz_generated.conversion.go

@@ -312,17 +312,6 @@ type MachineDeploymentSpec struct {
 	// paused indicates that the deployment is paused.
 	// +optional
 	Paused bool `json:"paused,omitempty"`
-
-	// progressDeadlineSeconds is the maximum time in seconds for a deployment to make progress before it
-	// is considered to be failed. The deployment controller will continue to
-	// process failed deployments and a condition with a ProgressDeadlineExceeded
-	// reason will be surfaced in the deployment status. Note that progress will
-	// not be estimated during the time a deployment is paused. Defaults to 600s.
-	//
-	// Deprecated: This field is deprecated and is going to be removed in the next apiVersion. Please see https://github.com/kubernetes-sigs/cluster-api/issues/11470 for more details.
-	//
-	// +optional
-	ProgressDeadlineSeconds *int32 `json:"progressDeadlineSeconds,omitempty"`
 }
 
 // ANCHOR_END: MachineDeploymentSpec

api/v1beta2/machinedeployment_types.go

@@ -531,6 +531,11 @@ func Convert_v1beta2_MachineSetSpec_To_v1alpha3_MachineSetSpec(in *clusterv1.Mac
 	return autoConvert_v1beta2_MachineSetSpec_To_v1alpha3_MachineSetSpec(in, out, s)
 }
 
+func Convert_v1alpha3_MachineDeploymentSpec_To_v1beta2_MachineDeploymentSpec(in *MachineDeploymentSpec, out *clusterv1.MachineDeploymentSpec, s apimachineryconversion.Scope) error {
+	// NOTE: v1beta2 MachineDeploymentSpec does not have ProgressDeadlineSeconds anymore. But it's fine to just lose this field it was never used.
+	return autoConvert_v1alpha3_MachineDeploymentSpec_To_v1beta2_MachineDeploymentSpec(in, out, s)
+}
+
 func Convert_v1alpha3_MachineDeploymentStatus_To_v1beta2_MachineDeploymentStatus(in *MachineDeploymentStatus, out *clusterv1.MachineDeploymentStatus, s apimachineryconversion.Scope) error {
 	return autoConvert_v1alpha3_MachineDeploymentStatus_To_v1beta2_MachineDeploymentStatus(in, out, s)
 }

api/v1beta2/zz_generated.deepcopy.go

@@ -122,6 +122,7 @@ func hubMachineSetStatus(in *clusterv1.MachineSetStatus, c fuzz.Continue) {
 func MachineDeploymentFuzzFunc(_ runtimeserializer.CodecFactory) []interface{} {
 	return []interface{}{
 		hubMachineDeploymentStatus,
+		spokeMachineDeploymentSpec,
 		spokeObjectMeta,
 		spokeBootstrap,
 	}
@@ -138,6 +139,13 @@ func hubMachineDeploymentStatus(in *clusterv1.MachineDeploymentStatus, c fuzz.Co
 	}
 }
 
+func spokeMachineDeploymentSpec(in *MachineDeploymentSpec, c fuzz.Continue) {
+	c.FuzzNoCustom(in)
+
+	// Drop ProgressDeadlineSeconds as we intentionally don't preserve it.
+	in.ProgressDeadlineSeconds = nil
+}
+
 func spokeObjectMeta(in *ObjectMeta, c fuzz.Continue) {
 	c.FuzzNoCustom(in)