Merge pull request #5315 from fabriziopandini/remove-machine.status.version

⚠️ Remove machine.status.version

Author: k8s-ci-robot

api/v1alpha3/conversion.go

@@ -210,11 +210,6 @@ func (dst *MachineDeployment) ConvertFrom(srcRaw conversion.Hub) error {
 	return nil
 }
 
-// Status.Conditions was introduced in v1alpha4, thus requiring a custom conversion function; the values is going to be preserved in an annotation thus allowing roundtrip without loosing informations
-func Convert_v1beta1_MachineDeploymentStatus_To_v1alpha3_MachineDeploymentStatus(in *v1beta1.MachineDeploymentStatus, out *MachineDeploymentStatus, s apiconversion.Scope) error {
-	return autoConvert_v1beta1_MachineDeploymentStatus_To_v1alpha3_MachineDeploymentStatus(in, out, s)
-}
-
 func (src *MachineDeploymentList) ConvertTo(dstRaw conversion.Hub) error {
 	dst := dstRaw.(*v1beta1.MachineDeploymentList)
 
@@ -307,3 +302,13 @@ func Convert_v1alpha3_ObjectMeta_To_v1beta1_ObjectMeta(in *ObjectMeta, out *v1be
 func Convert_v1beta1_MachineStatus_To_v1alpha3_MachineStatus(in *v1beta1.MachineStatus, out *MachineStatus, s apiconversion.Scope) error {
 	return autoConvert_v1beta1_MachineStatus_To_v1alpha3_MachineStatus(in, out, s)
 }
+
+func Convert_v1beta1_MachineDeploymentStatus_To_v1alpha3_MachineDeploymentStatus(in *v1beta1.MachineDeploymentStatus, out *MachineDeploymentStatus, s apiconversion.Scope) error {
+	// Status.Conditions was introduced in v1alpha4, thus requiring a custom conversion function; the values is going to be preserved in an annotation thus allowing roundtrip without loosing informations
+	return autoConvert_v1beta1_MachineDeploymentStatus_To_v1alpha3_MachineDeploymentStatus(in, out, s)
+}
+
+func Convert_v1alpha3_MachineStatus_To_v1beta1_MachineStatus(in *MachineStatus, out *v1beta1.MachineStatus, s apiconversion.Scope) error {
+	// Status.version has been removed in v1beta1, thus requiring custom conversion function. the information will be dropped.
+	return autoConvert_v1alpha3_MachineStatus_To_v1beta1_MachineStatus(in, out, s)
+}

api/v1alpha3/conversion_test.go

@@ -37,7 +37,7 @@ func TestFuzzyConversion(t *testing.T) {
 	t.Run("for Machine", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
 		Hub:         &v1beta1.Machine{},
 		Spoke:       &Machine{},
-		FuzzerFuncs: []fuzzer.FuzzerFuncs{BootstrapFuzzFuncs},
+		FuzzerFuncs: []fuzzer.FuzzerFuncs{BootstrapFuzzFuncs, MachineStatusFuzzFunc},
 	}))
 
 	t.Run("for MachineSet", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
@@ -58,6 +58,20 @@ func TestFuzzyConversion(t *testing.T) {
 	}))
 }
 
+func MachineStatusFuzzFunc(_ runtimeserializer.CodecFactory) []interface{} {
+	return []interface{}{
+		MachineStatusFuzzer,
+	}
+}
+
+func MachineStatusFuzzer(in *MachineStatus, c fuzz.Continue) {
+	c.FuzzNoCustom(in)
+
+	// These fields have been removed in v1beta1
+	// data is going to be lost, so we're forcing zero values to avoid round trip errors.
+	in.Version = nil
+}
+
 func CustomObjectMetaFuzzFunc(_ runtimeserializer.CodecFactory) []interface{} {
 	return []interface{}{
 		CustomObjectMetaFuzzer,

api/v1alpha3/zz_generated.conversion.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha4
 
 import (
+	apiconversion "k8s.io/apimachinery/pkg/conversion"
 	"sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
@@ -164,3 +165,8 @@ func (dst *MachineHealthCheckList) ConvertFrom(srcRaw conversion.Hub) error {
 
 	return Convert_v1beta1_MachineHealthCheckList_To_v1alpha4_MachineHealthCheckList(src, dst, nil)
 }
+
+func Convert_v1alpha4_MachineStatus_To_v1beta1_MachineStatus(in *MachineStatus, out *v1beta1.MachineStatus, s apiconversion.Scope) error {
+	// Status.version has been removed in v1beta1, thus requiring custom conversion function. the information will be dropped.
+	return autoConvert_v1alpha4_MachineStatus_To_v1beta1_MachineStatus(in, out, s)
+}

api/v1alpha4/conversion.go

@@ -19,6 +19,9 @@ package v1alpha4
 import (
 	"testing"
 
+	fuzz "github.com/google/gofuzz"
+	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
+	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	"sigs.k8s.io/cluster-api/api/v1beta1"
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 )
@@ -34,8 +37,9 @@ func TestFuzzyConversion(t *testing.T) {
 	}))
 
 	t.Run("for Machine", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
-		Hub:   &v1beta1.Machine{},
-		Spoke: &Machine{},
+		Hub:         &v1beta1.Machine{},
+		Spoke:       &Machine{},
+		FuzzerFuncs: []fuzzer.FuzzerFuncs{MachineStatusFuzzFunc},
 	}))
 
 	t.Run("for MachineSet", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
@@ -53,3 +57,17 @@ func TestFuzzyConversion(t *testing.T) {
 		Spoke: &MachineHealthCheck{},
 	}))
 }
+
+func MachineStatusFuzzFunc(_ runtimeserializer.CodecFactory) []interface{} {
+	return []interface{}{
+		MachineStatusFuzzer,
+	}
+}
+
+func MachineStatusFuzzer(in *MachineStatus, c fuzz.Continue) {
+	c.FuzzNoCustom(in)
+
+	// These fields have been removed in v1beta1
+	// data is going to be lost, so we're forcing zero values to avoid round trip errors.
+	in.Version = nil
+}

api/v1alpha4/conversion_test.go

@@ -116,13 +116,6 @@ type MachineStatus struct {
 	// +optional
 	LastUpdated *metav1.Time `json:"lastUpdated,omitempty"`
 
-	// Version specifies the current version of Kubernetes running
-	// on the corresponding Node. This is meant to be a means of bubbling
-	// up status from the Node to the Machine.
-	// It is entirely optional, but useful for end-user UX if it’s present.
-	// +optional
-	Version *string `json:"version,omitempty"`
-
 	// FailureReason will be set in the event that there is a terminal problem
 	// reconciling the Machine and will contain a succinct value suitable
 	// for machine interpretation.

api/v1alpha4/zz_generated.conversion.go

@@ -1125,12 +1125,6 @@ spec:
                 description: Phase represents the current phase of machine actuation.
                   E.g. Pending, Running, Terminating, Failed etc.
                 type: string
-              version:
-                description: Version specifies the current version of Kubernetes running
-                  on the corresponding Node. This is meant to be a means of bubbling
-                  up status from the Node to the Machine. It is entirely optional,
-                  but useful for end-user UX if it’s present.
-                type: string
             type: object
         type: object
     served: true