feat: surface machine version

Signed-off-by: Miltiadis Alexis <alexmiltiadis@gmail.com>

Author: miltalex

api/controlplane/kubeadm/v1beta1/conversion.go

@@ -79,6 +79,7 @@ func (src *KubeadmControlPlane) ConvertTo(dstRaw conversion.Hub) error {
 	if ok {
 		bootstrapv1beta1.RestoreKubeadmConfigSpec(&restored.Spec.KubeadmConfigSpec, &dst.Spec.KubeadmConfigSpec)
 		dst.Spec.MachineTemplate.Spec.Taints = restored.Spec.MachineTemplate.Spec.Taints
+		dst.Status.Versions = restored.Status.Versions
 	}
 
 	if src.Spec.RemediationStrategy != nil {

api/controlplane/kubeadm/v1beta1/zz_generated.conversion.go

@@ -713,8 +713,17 @@ type KubeadmControlPlaneStatus struct {
 	// +optional
 	UpToDateReplicas *int32 `json:"upToDateReplicas,omitempty"`
 
+	// versions is the aggregated Kubernetes versions in this KubeadmControlPlane.
+	// +optional
+	// +listType=map
+	// +listMapKey=version
+	// +kubebuilder:validation:MaxItems=100
+	Versions []clusterv1.StatusVersion `json:"versions,omitempty"`
+
 	// version represents the minimum Kubernetes version for the control plane machines
 	// in the cluster.
+	// Deprecated: This field is deprecated and is going to be removed in a future API version. Please use status.versions instead.
+	//
 	// +optional
 	// +kubebuilder:validation:MinLength=1
 	// +kubebuilder:validation:MaxLength=256

api/controlplane/kubeadm/v1beta2/kubeadm_control_plane_types.go

@@ -89,6 +89,20 @@ func (src *Cluster) ConvertTo(dstRaw conversion.Hub) error {
 	if !reflect.DeepEqual(initialization, clusterv1.ClusterInitializationStatus{}) {
 		dst.Status.Initialization = initialization
 	}
+	if ok {
+		if restored.Status.ControlPlane != nil {
+			if dst.Status.ControlPlane == nil {
+				dst.Status.ControlPlane = &clusterv1.ClusterControlPlaneStatus{}
+			}
+			dst.Status.ControlPlane.Versions = restored.Status.ControlPlane.Versions
+		}
+		if restored.Status.Workers != nil {
+			if dst.Status.Workers == nil {
+				dst.Status.Workers = &clusterv1.WorkersStatus{}
+			}
+			dst.Status.Workers.Versions = restored.Status.Workers.Versions
+		}
+	}
 	return nil
 }
 
@@ -461,6 +475,7 @@ func (src *MachineSet) ConvertTo(dstRaw conversion.Hub) error {
 	// Recover other values
 	if ok {
 		dst.Spec.Template.Spec.Taints = restored.Spec.Template.Spec.Taints
+		dst.Status.Versions = restored.Status.Versions
 	}
 
 	return nil
@@ -509,6 +524,7 @@ func (src *MachineDeployment) ConvertTo(dstRaw conversion.Hub) error {
 	// Recover other values
 	if ok {
 		dst.Spec.Template.Spec.Taints = restored.Spec.Template.Spec.Taints
+		dst.Status.Versions = restored.Status.Versions
 	}
 
 	return nil
@@ -600,6 +616,7 @@ func (src *MachinePool) ConvertTo(dstRaw conversion.Hub) error {
 	// Recover other values
 	if ok {
 		dst.Spec.Template.Spec.Taints = restored.Spec.Template.Spec.Taints
+		dst.Status.Versions = restored.Status.Versions
 	}
 
 	return nil
@@ -1259,6 +1276,16 @@ func Convert_v1beta1_ClusterClassStatus_To_v1beta2_ClusterClassStatus(in *Cluste
 	return nil
 }
 
+func Convert_v1beta2_ClusterControlPlaneStatus_To_v1beta1_ClusterControlPlaneStatus(in *clusterv1.ClusterControlPlaneStatus, out *ClusterControlPlaneStatus, s apimachineryconversion.Scope) error {
+	if err := autoConvert_v1beta2_ClusterControlPlaneStatus_To_v1beta1_ClusterControlPlaneStatus(in, out, s); err != nil {
+		return err
+	}
+
+	// Versions does not exist in the v1beta1 peer type and cannot be represented here.
+	// It is restored during full-object conversion from data preserved in annotations.
+	return nil
+}
+
 func Convert_v1beta2_ClusterStatus_To_v1beta1_ClusterStatus(in *clusterv1.ClusterStatus, out *ClusterStatus, s apimachineryconversion.Scope) error {
 	if err := autoConvert_v1beta2_ClusterStatus_To_v1beta1_ClusterStatus(in, out, s); err != nil {
 		return err
@@ -1416,6 +1443,16 @@ func Convert_v1beta2_Topology_To_v1beta1_Topology(in *clusterv1.Topology, out *T
 	return nil
 }
 
+func Convert_v1beta2_WorkersStatus_To_v1beta1_WorkersStatus(in *clusterv1.WorkersStatus, out *WorkersStatus, s apimachineryconversion.Scope) error {
+	if err := autoConvert_v1beta2_WorkersStatus_To_v1beta1_WorkersStatus(in, out, s); err != nil {
+		return err
+	}
+
+	// Versions does not exist in the v1beta1 peer type and cannot be represented here.
+	// It is restored during full-object conversion from data preserved in annotations.
+	return nil
+}
+
 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/controlplane/kubeadm/v1beta2/zz_generated.deepcopy.go

@@ -1476,6 +1476,13 @@ type ClusterControlPlaneStatus struct {
 	// availableReplicas is the total number of available control plane machines in this cluster. A machine is considered available when Machine's Available condition is true.
 	// +optional
 	AvailableReplicas *int32 `json:"availableReplicas,omitempty"`
+
+	// versions is the aggregated Kubernetes versions in this control plane.
+	// +optional
+	// +listType=map
+	// +listMapKey=version
+	// +kubebuilder:validation:MaxItems=100
+	Versions []StatusVersion `json:"versions,omitempty"`
 }
 
 // WorkersStatus groups all the observations about workers current state.
@@ -1500,6 +1507,13 @@ type WorkersStatus struct {
 	// availableReplicas is the total number of available worker machines in this cluster. A machine is considered available when Machine's Available condition is true.
 	// +optional
 	AvailableReplicas *int32 `json:"availableReplicas,omitempty"`
+
+	// versions is the aggregated Kubernetes versions in cluster workers.
+	// +optional
+	// +listType=map
+	// +listMapKey=version
+	// +kubebuilder:validation:MaxItems=100
+	Versions []StatusVersion `json:"versions,omitempty"`
 }
 
 // SetTypedPhase sets the Phase field to the string representation of ClusterPhase.

api/core/v1beta1/conversion.go

@@ -267,6 +267,20 @@ var NodeOutdatedRevisionTaint = corev1.Taint{
 	Effect: corev1.TaintEffectPreferNoSchedule,
 }
 
+// StatusVersion groups version-related status information.
+// +kubebuilder:validation:MinProperties=1
+type StatusVersion struct {
+	// version is the Kubernetes version.
+	// +required
+	// +kubebuilder:validation:MinLength=1
+	// +kubebuilder:validation:MaxLength=256
+	Version string `json:"version"`
+
+	// replicas is the number of replicas at this version.
+	// +optional
+	Replicas *int32 `json:"replicas,omitempty"`
+}
+
 // NodeUninitializedTaint can be added to Nodes at creation by the bootstrap provider, e.g. the
 // KubeadmBootstrap provider will add the taint.
 // This taint is used to prevent workloads to be scheduled on Nodes before the node is initialized by Cluster API.

api/core/v1beta1/zz_generated.conversion.go

@@ -460,6 +460,13 @@ type MachineDeploymentStatus struct {
 	// +optional
 	UpToDateReplicas *int32 `json:"upToDateReplicas,omitempty"`
 
+	// versions is the aggregated Kubernetes versions in this MachineDeployment.
+	// +optional
+	// +listType=map
+	// +listMapKey=version
+	// +kubebuilder:validation:MaxItems=100
+	Versions []StatusVersion `json:"versions,omitempty"`
+
 	// phase represents the current phase of a MachineDeployment (ScalingUp, ScalingDown, Running, Failed, or Unknown).
 	// +optional
 	// +kubebuilder:validation:Enum=ScalingUp;ScalingDown;Running;Failed;Unknown

api/core/v1beta2/cluster_types.go

@@ -138,6 +138,13 @@ type MachinePoolStatus struct {
 	// +optional
 	UpToDateReplicas *int32 `json:"upToDateReplicas,omitempty"`
 
+	// versions is the aggregated Kubernetes versions in this MachinePool.
+	// +optional
+	// +listType=map
+	// +listMapKey=version
+	// +kubebuilder:validation:MaxItems=100
+	Versions []StatusVersion `json:"versions,omitempty"`
+
 	// phase represents the current phase of cluster actuation.
 	// +optional
 	// +kubebuilder:validation:Enum=Pending;Provisioning;Provisioned;Running;ScalingUp;ScalingDown;Scaling;Deleting;Failed;Unknown