Change LastRemediationStatus.RetryCount from int32 to *int32

Author: sbueringer

api/controlplane/kubeadm/v1beta1/conversion_test.go

@@ -245,6 +245,10 @@ func hubKubeadmControlPlaneStatus(in *controlplanev1.KubeadmControlPlaneStatus,
 	if in.Replicas == nil {
 		in.Replicas = ptr.To(int32(0))
 	}
+
+	if in.LastRemediation.RetryCount == nil {
+		in.LastRemediation.RetryCount = ptr.To(int32(0))  // RetryCount is a required field and nil does not round trip
+	}
 }
 
 func spokeKubeadmControlPlaneStatus(in *KubeadmControlPlaneStatus, c randfill.Continue) {

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

@@ -814,7 +814,8 @@ type LastRemediationStatus struct {
 	// retryCount used to keep track of remediation retry for the last remediated machine.
 	// A retry happens when a machine that was created as a replacement for an unhealthy machine also fails.
 	// +required
-	RetryCount int32 `json:"retryCount"`
+	// +kubebuilder:validation:Minimum=0
+	RetryCount *int32 `json:"retryCount,omitempty"`
 }
 
 // +kubebuilder:object:root=true

api/controlplane/kubeadm/v1beta2/kubeadm_control_plane_types.go

@@ -668,7 +668,7 @@ type RemediationData struct {
 	Machine string `json:"machine"`
 
 	// timestamp is when last remediation happened. It is represented in RFC3339 form and is in UTC.
-	Timestamp metav1.Time `json:"timestamp,omitempty,omitzero"`
+	Timestamp metav1.Time `json:"timestamp"`
 
 	// retryCount used to keep track of remediation retry for the last remediated machine.
 	// A retry happens when a machine that was created as a replacement for an unhealthy machine also fails.
@@ -698,6 +698,6 @@ func (r *RemediationData) ToStatus() controlplanev1.LastRemediationStatus {
 	return controlplanev1.LastRemediationStatus{
 		Machine:    r.Machine,
 		Time:       r.Timestamp,
-		RetryCount: int32(r.RetryCount),
+		RetryCount: ptr.To(int32(r.RetryCount)),
 	}
 }

api/controlplane/kubeadm/v1beta2/zz_generated.deepcopy.go

@@ -2077,7 +2077,7 @@ func TestKubeadmControlPlaneReconciler_setLastRemediation(t *testing.T) {
 
 		g.Expect(controlPlane.KCP.Status.LastRemediation.Machine).To(Equal(r1.Machine))
 		g.Expect(controlPlane.KCP.Status.LastRemediation.Time.Time).To(BeTemporally("==", r1.Timestamp.Time), cmp.Diff(controlPlane.KCP.Status.LastRemediation.Time.Time, r1.Timestamp.Time))
-		g.Expect(controlPlane.KCP.Status.LastRemediation.RetryCount).To(Equal(int32(r1.RetryCount)))
+		g.Expect(*controlPlane.KCP.Status.LastRemediation.RetryCount).To(Equal(int32(r1.RetryCount)))
 	})
 	t.Run("Remediation completed, get data from past remediation", func(t *testing.T) {
 		g := NewWithT(t)
@@ -2108,7 +2108,7 @@ func TestKubeadmControlPlaneReconciler_setLastRemediation(t *testing.T) {
 
 		g.Expect(controlPlane.KCP.Status.LastRemediation.Machine).To(Equal(r2.Machine))
 		g.Expect(controlPlane.KCP.Status.LastRemediation.Time.Time).To(BeTemporally("==", r2.Timestamp.Time), cmp.Diff(controlPlane.KCP.Status.LastRemediation.Time.Time, r2.Timestamp.Time))
-		g.Expect(controlPlane.KCP.Status.LastRemediation.RetryCount).To(Equal(int32(r2.RetryCount)))
+		g.Expect(*controlPlane.KCP.Status.LastRemediation.RetryCount).To(Equal(int32(r2.RetryCount)))
 	})
 }