Fix review findings

sbueringer · sbueringer · commit e9498d0ae723 · 2025-07-25T10:38:40.000+02:00
diff --git a/api/addons/v1beta1/conversion.go b/api/addons/v1beta1/conversion.go
@@ -137,7 +137,9 @@ func Convert_v1beta2_ResourceBinding_To_v1beta1_ResourceBinding(in *addonsv1.Res
 	if err := autoConvert_v1beta2_ResourceBinding_To_v1beta1_ResourceBinding(in, out, s); err != nil {
 		return err
 	}
-	out.LastAppliedTime = ptr.To(in.LastAppliedTime)
+	if !reflect.DeepEqual(in.LastAppliedTime, metav1.Time{}) {
+		out.LastAppliedTime = ptr.To(in.LastAppliedTime)
+	}
 	return nil
 }
 
diff --git a/api/addons/v1beta1/conversion_test.go b/api/addons/v1beta1/conversion_test.go
@@ -23,6 +23,7 @@ import (
 	"testing"
 
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	"sigs.k8s.io/randfill"
 
@@ -86,5 +87,12 @@ func spokeClusterResourceSetBindingSpec(in *ClusterResourceSetBindingSpec, c ran
 		if b != nil && reflect.DeepEqual(*b, ResourceSetBinding{}) {
 			in.Bindings[i] = nil
 		}
+		if in.Bindings[i] != nil {
+			for j, r := range in.Bindings[i].Resources {
+				if reflect.DeepEqual(r.LastAppliedTime, &metav1.Time{}) {
+					in.Bindings[i].Resources[j].LastAppliedTime = nil
+				}
+			}
+		}
 	}
 }
diff --git a/api/bootstrap/kubeadm/v1beta1/conversion.go b/api/bootstrap/kubeadm/v1beta1/conversion.go
@@ -431,7 +431,9 @@ func Convert_v1beta2_BootstrapToken_To_v1beta1_BootstrapToken(in *bootstrapv1.Bo
 		return err
 	}
 	out.TTL = clusterv1.ConvertFromSeconds(in.TTLSeconds)
-	out.Expires = ptr.To(in.Expires)
+	if !reflect.DeepEqual(in.Expires, metav1.Time{}) {
+		out.Expires = ptr.To(in.Expires)
+	}
 	return nil
 }
 
diff --git a/api/bootstrap/kubeadm/v1beta1/conversion_test.go b/api/bootstrap/kubeadm/v1beta1/conversion_test.go
@@ -165,6 +165,9 @@ func spokeBootstrapToken(in *BootstrapToken, c randfill.Continue) {
 	if in.TTL != nil {
 		in.TTL = ptr.To[metav1.Duration](metav1.Duration{Duration: time.Duration(c.Int31()) * time.Second})
 	}
+	if reflect.DeepEqual(in.Expires, &metav1.Time{}) {
+		in.Expires = nil
+	}
 }
 
 func spokeDiscovery(in *Discovery, c randfill.Continue) {
diff --git a/api/controlplane/kubeadm/v1beta1/conversion.go b/api/controlplane/kubeadm/v1beta1/conversion.go
@@ -173,7 +173,9 @@ func Convert_v1beta2_KubeadmControlPlaneSpec_To_v1beta1_KubeadmControlPlaneSpec(
 		out.RolloutBefore = &RolloutBefore{}
 		out.RolloutBefore.CertificatesExpiryDays = ptr.To(in.Rollout.Before.CertificatesExpiryDays)
 	}
-	out.RolloutAfter = ptr.To(in.Rollout.After)
+	if !reflect.DeepEqual(in.Rollout.After, metav1.Time{}) {
+		out.RolloutAfter = ptr.To(in.Rollout.After)
+	}
 	if !reflect.DeepEqual(in.Rollout.Strategy, controlplanev1.KubeadmControlPlaneRolloutStrategy{}) {
 		out.RolloutStrategy = &RolloutStrategy{}
 		out.RolloutStrategy.Type = RolloutStrategyType(in.Rollout.Strategy.Type)
@@ -234,7 +236,9 @@ func Convert_v1beta2_KubeadmControlPlaneTemplateResourceSpec_To_v1beta1_KubeadmC
 		out.RolloutBefore = &RolloutBefore{}
 		out.RolloutBefore.CertificatesExpiryDays = ptr.To(in.Rollout.Before.CertificatesExpiryDays)
 	}
-	out.RolloutAfter = ptr.To(in.Rollout.After)
+	if !reflect.DeepEqual(in.Rollout.After, metav1.Time{}) {
+		out.RolloutAfter = ptr.To(in.Rollout.After)
+	}
 	if !reflect.DeepEqual(in.Rollout.Strategy, controlplanev1.KubeadmControlPlaneRolloutStrategy{}) {
 		out.RolloutStrategy = &RolloutStrategy{}
 		out.RolloutStrategy.Type = RolloutStrategyType(in.Rollout.Strategy.Type)
diff --git a/api/controlplane/kubeadm/v1beta1/conversion_test.go b/api/controlplane/kubeadm/v1beta1/conversion_test.go
@@ -170,6 +170,9 @@ func spokeKubeadmControlPlane(in *KubeadmControlPlane, c randfill.Continue) {
 	if reflect.DeepEqual(in.Spec.RolloutStrategy, &RolloutStrategy{}) {
 		in.Spec.RolloutStrategy = nil
 	}
+	if reflect.DeepEqual(in.Spec.RolloutAfter, &metav1.Time{}) {
+		in.Spec.RolloutAfter = nil
+	}
 }
 
 func hubKubeadmControlPlaneStatus(in *controlplanev1.KubeadmControlPlaneStatus, c randfill.Continue) {
@@ -249,6 +252,9 @@ func spokeKubeadmControlPlaneTemplate(in *KubeadmControlPlaneTemplate, c randfil
 	if reflect.DeepEqual(in.Spec.Template.Spec.RolloutStrategy, &RolloutStrategy{}) {
 		in.Spec.Template.Spec.RolloutStrategy = nil
 	}
+	if reflect.DeepEqual(in.Spec.Template.Spec.RolloutAfter, &metav1.Time{}) {
+		in.Spec.Template.Spec.RolloutAfter = nil
+	}
 }
 
 func spokeRemediationStrategy(in *RemediationStrategy, c randfill.Continue) {
@@ -294,6 +300,9 @@ func spokeBootstrapToken(in *bootstrapv1beta1.BootstrapToken, c randfill.Continu
 	if in.TTL != nil {
 		in.TTL = ptr.To[metav1.Duration](metav1.Duration{Duration: time.Duration(c.Int31()) * time.Second})
 	}
+	if reflect.DeepEqual(in.Expires, &metav1.Time{}) {
+		in.Expires = nil
+	}
 }
 
 var testGVKs = []schema.GroupVersionKind{
diff --git a/api/core/v1beta1/conversion.go b/api/core/v1beta1/conversion.go
@@ -1618,9 +1618,12 @@ func Convert_v1beta2_MachineStatus_To_v1beta1_MachineStatus(in *clusterv1.Machin
 	if err := autoConvert_v1beta2_MachineStatus_To_v1beta1_MachineStatus(in, out, s); err != nil {
 		return err
 	}
-
-	out.LastUpdated = ptr.To(in.LastUpdated)
-	out.CertificatesExpiryDate = ptr.To(in.CertificatesExpiryDate)
+	if !reflect.DeepEqual(in.LastUpdated, metav1.Time{}) {
+		out.LastUpdated = ptr.To(in.LastUpdated)
+	}
+	if !reflect.DeepEqual(in.CertificatesExpiryDate, metav1.Time{}) {
+		out.CertificatesExpiryDate = ptr.To(in.CertificatesExpiryDate)
+	}
 
 	// Reset conditions from autogenerated conversions
 	// NOTE: v1beta2 conditions should not be automatically be converted into legacy conditions (v1beta1).
@@ -2120,7 +2123,9 @@ func Convert_v1beta2_MachineDeploymentSpec_To_v1beta1_MachineDeploymentSpec(in *
 		}
 		out.Strategy.Remediation.MaxInFlight = in.Remediation.MaxInFlight
 	}
-	out.RolloutAfter = ptr.To(in.Rollout.After)
+	if !reflect.DeepEqual(in.Rollout.After, metav1.Time{}) {
+		out.RolloutAfter = ptr.To(in.Rollout.After)
+	}
 
 	return nil
 }
@@ -2281,7 +2286,11 @@ func Convert_v1beta1_MachineDeletionStatus_To_v1beta2_MachineDeletionStatus(in *
 }
 
 func Convert_v1beta2_MachineDeletionStatus_To_v1beta1_MachineDeletionStatus(in *clusterv1.MachineDeletionStatus, out *MachineDeletionStatus, _ apimachineryconversion.Scope) error {
-	out.NodeDrainStartTime = ptr.To(in.NodeDrainStartTime)
-	out.WaitForNodeVolumeDetachStartTime = ptr.To(in.WaitForNodeVolumeDetachStartTime)
+	if !reflect.DeepEqual(in.NodeDrainStartTime, metav1.Time{}) {
+		out.NodeDrainStartTime = ptr.To(in.NodeDrainStartTime)
+	}
+	if !reflect.DeepEqual(in.WaitForNodeVolumeDetachStartTime, metav1.Time{}) {
+		out.WaitForNodeVolumeDetachStartTime = ptr.To(in.WaitForNodeVolumeDetachStartTime)
+	}
 	return nil
 }
diff --git a/api/core/v1beta1/conversion_test.go b/api/core/v1beta1/conversion_test.go
@@ -531,6 +531,20 @@ func spokeMachineStatus(in *MachineStatus, c randfill.Continue) {
 			Kind:       "Node",
 		}
 	}
+	if reflect.DeepEqual(in.LastUpdated, &metav1.Time{}) {
+		in.LastUpdated = nil
+	}
+	if reflect.DeepEqual(in.CertificatesExpiryDate, &metav1.Time{}) {
+		in.CertificatesExpiryDate = nil
+	}
+	if in.Deletion != nil {
+		if reflect.DeepEqual(in.Deletion.NodeDrainStartTime, &metav1.Time{}) {
+			in.Deletion.NodeDrainStartTime = nil
+		}
+		if reflect.DeepEqual(in.Deletion.WaitForNodeVolumeDetachStartTime, &metav1.Time{}) {
+			in.Deletion.WaitForNodeVolumeDetachStartTime = nil
+		}
+	}
 }
 
 func MachineSetFuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {
@@ -638,6 +652,9 @@ func spokeMachineDeploymentSpec(in *MachineDeploymentSpec, c randfill.Continue)
 			in.Strategy = nil
 		}
 	}
+	if reflect.DeepEqual(in.RolloutAfter, &metav1.Time{}) {
+		in.RolloutAfter = nil
+	}
 }
 
 func spokeMachineDeploymentStatus(in *MachineDeploymentStatus, c randfill.Continue) {
diff --git a/bootstrap/kubeadm/types/upstreamv1beta3/conversion.go b/bootstrap/kubeadm/types/upstreamv1beta3/conversion.go
@@ -243,7 +243,9 @@ func Convert_v1beta2_BootstrapToken_To_upstreamv1beta3_BootstrapToken(in *bootst
 		return err
 	}
 	out.TTL = clusterv1.ConvertFromSeconds(in.TTLSeconds)
-	out.Expires = ptr.To(in.Expires)
+	if !reflect.DeepEqual(in.Expires, metav1.Time{}) {
+		out.Expires = ptr.To(in.Expires)
+	}
 	return nil
 }
 
diff --git a/bootstrap/kubeadm/types/upstreamv1beta3/conversion_test.go b/bootstrap/kubeadm/types/upstreamv1beta3/conversion_test.go
@@ -19,6 +19,7 @@ limitations under the License.
 package upstreamv1beta3
 
 import (
+	"reflect"
 	"testing"
 	"time"
 
@@ -170,6 +171,9 @@ func spokeBootstrapToken(in *BootstrapToken, c randfill.Continue) {
 	if in.TTL != nil {
 		in.TTL = ptr.To[metav1.Duration](metav1.Duration{Duration: time.Duration(c.Int31()) * time.Second})
 	}
+	if reflect.DeepEqual(in.Expires, &metav1.Time{}) {
+		in.Expires = nil
+	}
 }
 
 func hubAPIServerFuzzer(obj *bootstrapv1.APIServer, c randfill.Continue) {
diff --git a/bootstrap/kubeadm/types/upstreamv1beta4/conversion.go b/bootstrap/kubeadm/types/upstreamv1beta4/conversion.go
@@ -247,7 +247,9 @@ func Convert_v1beta2_BootstrapToken_To_upstreamv1beta4_BootstrapToken(in *bootst
 		return err
 	}
 	out.TTL = clusterv1.ConvertFromSeconds(in.TTLSeconds)
-	out.Expires = ptr.To(in.Expires)
+	if !reflect.DeepEqual(in.Expires, metav1.Time{}) {
+		out.Expires = ptr.To(in.Expires)
+	}
 	return nil
 }
 
diff --git a/bootstrap/kubeadm/types/upstreamv1beta4/conversion_test.go b/bootstrap/kubeadm/types/upstreamv1beta4/conversion_test.go
@@ -19,6 +19,7 @@ limitations under the License.
 package upstreamv1beta4
 
 import (
+	"reflect"
 	"testing"
 	"time"
 
@@ -176,6 +177,9 @@ func spokeBootstrapToken(in *BootstrapToken, c randfill.Continue) {
 	if in.TTL != nil {
 		in.TTL = ptr.To[metav1.Duration](metav1.Duration{Duration: time.Duration(c.Int31()) * time.Second})
 	}
+	if reflect.DeepEqual(in.Expires, &metav1.Time{}) {
+		in.Expires = nil
+	}
 }
 
 func hubJoinConfigurationFuzzer(obj *bootstrapv1.JoinConfiguration, c randfill.Continue) {
diff --git a/internal/api/addons/v1alpha3/conversion.go b/internal/api/addons/v1alpha3/conversion.go
@@ -151,7 +151,9 @@ func Convert_v1beta2_ResourceBinding_To_v1alpha3_ResourceBinding(in *addonsv1.Re
 	if err := autoConvert_v1beta2_ResourceBinding_To_v1alpha3_ResourceBinding(in, out, s); err != nil {
 		return err
 	}
-	out.LastAppliedTime = ptr.To(in.LastAppliedTime)
+	if !reflect.DeepEqual(in.LastAppliedTime, metav1.Time{}) {
+		out.LastAppliedTime = ptr.To(in.LastAppliedTime)
+	}
 	return nil
 }
 
diff --git a/internal/api/addons/v1alpha3/conversion_test.go b/internal/api/addons/v1alpha3/conversion_test.go
@@ -23,6 +23,7 @@ import (
 	"testing"
 
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	"sigs.k8s.io/randfill"
 
@@ -39,8 +40,8 @@ func TestFuzzyConversion(t *testing.T) {
 		FuzzerFuncs: []fuzzer.FuzzerFuncs{ClusterResourceSetFuzzFuncs},
 	}))
 	t.Run("for ClusterResourceSetBinding", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
-		Hub:   &addonsv1.ClusterResourceSetBinding{},
-		Spoke: &ClusterResourceSetBinding{},
+		Hub:         &addonsv1.ClusterResourceSetBinding{},
+		Spoke:       &ClusterResourceSetBinding{},
 		FuzzerFuncs: []fuzzer.FuzzerFuncs{ClusterResourceSetBindingFuzzFuncs},
 	}))
 }
@@ -75,5 +76,12 @@ func spokeClusterResourceSetBindingSpec(in *ClusterResourceSetBindingSpec, c ran
 		if b != nil && reflect.DeepEqual(*b, ResourceSetBinding{}) {
 			in.Bindings[i] = nil
 		}
+		if in.Bindings[i] != nil {
+			for j, r := range in.Bindings[i].Resources {
+				if reflect.DeepEqual(r.LastAppliedTime, &metav1.Time{}) {
+					in.Bindings[i].Resources[j].LastAppliedTime = nil
+				}
+			}
+		}
 	}
 }
diff --git a/internal/api/addons/v1alpha4/conversion.go b/internal/api/addons/v1alpha4/conversion.go
@@ -152,7 +152,9 @@ func Convert_v1beta2_ResourceBinding_To_v1alpha4_ResourceBinding(in *addonsv1.Re
 	if err := autoConvert_v1beta2_ResourceBinding_To_v1alpha4_ResourceBinding(in, out, s); err != nil {
 		return err
 	}
-	out.LastAppliedTime = ptr.To(in.LastAppliedTime)
+	if !reflect.DeepEqual(in.LastAppliedTime, metav1.Time{}) {
+		out.LastAppliedTime = ptr.To(in.LastAppliedTime)
+	}
 	return nil
 }
 
diff --git a/internal/api/addons/v1alpha4/conversion_test.go b/internal/api/addons/v1alpha4/conversion_test.go
@@ -23,6 +23,7 @@ import (
 	"testing"
 
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	"sigs.k8s.io/randfill"
 
@@ -39,8 +40,8 @@ func TestFuzzyConversion(t *testing.T) {
 		FuzzerFuncs: []fuzzer.FuzzerFuncs{ClusterResourceSetFuzzFuncs},
 	}))
 	t.Run("for ClusterResourceSetBinding", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
-		Hub:   &addonsv1.ClusterResourceSetBinding{},
-		Spoke: &ClusterResourceSetBinding{},
+		Hub:         &addonsv1.ClusterResourceSetBinding{},
+		Spoke:       &ClusterResourceSetBinding{},
 		FuzzerFuncs: []fuzzer.FuzzerFuncs{ClusterResourceSetBindingFuzzFuncs},
 	}))
 }
@@ -75,5 +76,12 @@ func spokeClusterResourceSetBindingSpec(in *ClusterResourceSetBindingSpec, c ran
 		if b != nil && reflect.DeepEqual(*b, ResourceSetBinding{}) {
 			in.Bindings[i] = nil
 		}
+		if in.Bindings[i] != nil {
+			for j, r := range in.Bindings[i].Resources {
+				if reflect.DeepEqual(r.LastAppliedTime, &metav1.Time{}) {
+					in.Bindings[i].Resources[j].LastAppliedTime = nil
+				}
+			}
+		}
 	}
 }
diff --git a/internal/api/bootstrap/kubeadm/v1alpha3/conversion.go b/internal/api/bootstrap/kubeadm/v1alpha3/conversion.go
@@ -427,7 +427,9 @@ func Convert_v1beta2_BootstrapToken_To_v1alpha3_BootstrapToken(in *bootstrapv1.B
 		return err
 	}
 	out.TTL = clusterv1.ConvertFromSeconds(in.TTLSeconds)
-	out.Expires = ptr.To(in.Expires)
+	if !reflect.DeepEqual(in.Expires, metav1.Time{}) {
+		out.Expires = ptr.To(in.Expires)
+	}
 	return nil
 }
 
diff --git a/internal/api/bootstrap/kubeadm/v1alpha3/conversion_test.go b/internal/api/bootstrap/kubeadm/v1alpha3/conversion_test.go
@@ -19,6 +19,7 @@ limitations under the License.
 package v1alpha3
 
 import (
+	"reflect"
 	"testing"
 	"time"
 
@@ -185,6 +186,9 @@ func spokeBootstrapToken(in *BootstrapToken, c randfill.Continue) {
 	if in.TTL != nil {
 		in.TTL = ptr.To[metav1.Duration](metav1.Duration{Duration: time.Duration(c.Int31()) * time.Second})
 	}
+	if reflect.DeepEqual(in.Expires, &metav1.Time{}) {
+		in.Expires = nil
+	}
 }
 
 func spokeDiscovery(in *Discovery, c randfill.Continue) {
diff --git a/internal/api/bootstrap/kubeadm/v1alpha4/conversion.go b/internal/api/bootstrap/kubeadm/v1alpha4/conversion.go
@@ -486,7 +486,9 @@ func Convert_v1beta2_BootstrapToken_To_v1alpha4_BootstrapToken(in *bootstrapv1.B
 		return err
 	}
 	out.TTL = clusterv1.ConvertFromSeconds(in.TTLSeconds)
-	out.Expires = ptr.To(in.Expires)
+	if !reflect.DeepEqual(in.Expires, metav1.Time{}) {
+		out.Expires = ptr.To(in.Expires)
+	}
 	return nil
 }
 
diff --git a/internal/api/bootstrap/kubeadm/v1alpha4/conversion_test.go b/internal/api/bootstrap/kubeadm/v1alpha4/conversion_test.go
@@ -19,6 +19,7 @@ limitations under the License.
 package v1alpha4
 
 import (
+	"reflect"
 	"testing"
 	"time"
 
@@ -171,6 +172,9 @@ func spokeBootstrapToken(in *BootstrapToken, c randfill.Continue) {
 	if in.TTL != nil {
 		in.TTL = ptr.To[metav1.Duration](metav1.Duration{Duration: time.Duration(c.Int31()) * time.Second})
 	}
+	if reflect.DeepEqual(in.Expires, &metav1.Time{}) {
+		in.Expires = nil
+	}
 }
 
 func spokeDiscovery(in *Discovery, c randfill.Continue) {
diff --git a/internal/api/controlplane/kubeadm/v1alpha3/conversion.go b/internal/api/controlplane/kubeadm/v1alpha3/conversion.go
@@ -174,7 +174,9 @@ func Convert_v1beta2_KubeadmControlPlaneSpec_To_v1alpha3_KubeadmControlPlaneSpec
 	if err := autoConvert_v1beta2_KubeadmControlPlaneSpec_To_v1alpha3_KubeadmControlPlaneSpec(in, out, s); err != nil {
 		return err
 	}
-	out.UpgradeAfter = ptr.To(in.Rollout.After)
+	if !reflect.DeepEqual(in.Rollout.After, metav1.Time{}) {
+		out.UpgradeAfter = ptr.To(in.Rollout.After)
+	}
 	out.NodeDrainTimeout = clusterv1.ConvertFromSeconds(in.MachineTemplate.Spec.Deletion.NodeDrainTimeoutSeconds)
 	if !reflect.DeepEqual(in.Rollout.Strategy, controlplanev1.KubeadmControlPlaneRolloutStrategy{}) {
 		out.RolloutStrategy = &RolloutStrategy{}
diff --git a/internal/api/controlplane/kubeadm/v1alpha3/conversion_test.go b/internal/api/controlplane/kubeadm/v1alpha3/conversion_test.go
diff --git a/internal/api/controlplane/kubeadm/v1alpha4/conversion.go b/internal/api/controlplane/kubeadm/v1alpha4/conversion.go
diff --git a/internal/api/controlplane/kubeadm/v1alpha4/conversion_test.go b/internal/api/controlplane/kubeadm/v1alpha4/conversion_test.go
diff --git a/internal/api/core/v1alpha3/conversion.go b/internal/api/core/v1alpha3/conversion.go
diff --git a/internal/api/core/v1alpha3/conversion_test.go b/internal/api/core/v1alpha3/conversion_test.go
diff --git a/internal/api/core/v1alpha4/conversion.go b/internal/api/core/v1alpha4/conversion.go
diff --git a/internal/api/core/v1alpha4/conversion_test.go b/internal/api/core/v1alpha4/conversion_test.go
diff --git a/internal/controllers/topology/cluster/structuredmerge/options.go b/internal/controllers/topology/cluster/structuredmerge/options.go
diff --git a/internal/util/ssa/filterintent.go b/internal/util/ssa/filterintent.go
diff --git a/util/conversion/conversion.go b/util/conversion/conversion.go

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,9 @@ func Convert_v1beta2_ResourceBinding_To_v1beta1_ResourceBinding(in *addonsv1.Res`
`137`	`137`	`if err := autoConvert_v1beta2_ResourceBinding_To_v1beta1_ResourceBinding(in, out, s); err != nil {`
`138`	`138`	`return err`
`139`	`139`	`}`
`140`		`- out.LastAppliedTime = ptr.To(in.LastAppliedTime)`
	`140`	`+ if !reflect.DeepEqual(in.LastAppliedTime, metav1.Time{}) {`
	`141`	`+ out.LastAppliedTime = ptr.To(in.LastAppliedTime)`
	`142`	`+ }`
`141`	`143`	`return nil`
`142`	`144`	`}`
`143`	`145`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ import (`
`23`	`23`	`"testing"`
`24`	`24`
`25`	`25`	`"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"`
	`26`	`+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`26`	`27`	`runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"`
`27`	`28`	`"sigs.k8s.io/randfill"`
`28`	`29`
`@@ -86,5 +87,12 @@ func spokeClusterResourceSetBindingSpec(in *ClusterResourceSetBindingSpec, c ran`
`86`	`87`	`if b != nil && reflect.DeepEqual(*b, ResourceSetBinding{}) {`
`87`	`88`	`in.Bindings[i] = nil`
`88`	`89`	`}`
	`90`	`+ if in.Bindings[i] != nil {`
	`91`	`+ for j, r := range in.Bindings[i].Resources {`
	`92`	`+ if reflect.DeepEqual(r.LastAppliedTime, &metav1.Time{}) {`
	`93`	`+ in.Bindings[i].Resources[j].LastAppliedTime = nil`
	`94`	`+ }`
	`95`	`+ }`
	`96`	`+ }`
`89`	`97`	`}`
`90`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -431,7 +431,9 @@ func Convert_v1beta2_BootstrapToken_To_v1beta1_BootstrapToken(in *bootstrapv1.Bo`
`431`	`431`	`return err`
`432`	`432`	`}`
`433`	`433`	`out.TTL = clusterv1.ConvertFromSeconds(in.TTLSeconds)`
`434`		`- out.Expires = ptr.To(in.Expires)`
	`434`	`+ if !reflect.DeepEqual(in.Expires, metav1.Time{}) {`
	`435`	`+ out.Expires = ptr.To(in.Expires)`
	`436`	`+ }`
`435`	`437`	`return nil`
`436`	`438`	`}`
`437`	`439`
Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,9 @@ func spokeBootstrapToken(in *BootstrapToken, c randfill.Continue) {`
`165`	`165`	`if in.TTL != nil {`
`166`	`166`	`in.TTL = ptr.To[metav1.Duration](metav1.Duration{Duration: time.Duration(c.Int31()) * time.Second})`
`167`	`167`	`}`
	`168`	`+ if reflect.DeepEqual(in.Expires, &metav1.Time{}) {`
	`169`	`+ in.Expires = nil`
	`170`	`+ }`
`168`	`171`	`}`
`169`	`172`
`170`	`173`	`func spokeDiscovery(in *Discovery, c randfill.Continue) {`
Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,9 @@ func spokeKubeadmControlPlane(in *KubeadmControlPlane, c randfill.Continue) {`
`170`	`170`	`if reflect.DeepEqual(in.Spec.RolloutStrategy, &RolloutStrategy{}) {`
`171`	`171`	`in.Spec.RolloutStrategy = nil`
`172`	`172`	`}`
	`173`	`+ if reflect.DeepEqual(in.Spec.RolloutAfter, &metav1.Time{}) {`
	`174`	`+ in.Spec.RolloutAfter = nil`
	`175`	`+ }`
`173`	`176`	`}`
`174`	`177`
`175`	`178`	`func hubKubeadmControlPlaneStatus(in *controlplanev1.KubeadmControlPlaneStatus, c randfill.Continue) {`
`@@ -249,6 +252,9 @@ func spokeKubeadmControlPlaneTemplate(in *KubeadmControlPlaneTemplate, c randfil`
`249`	`252`	`if reflect.DeepEqual(in.Spec.Template.Spec.RolloutStrategy, &RolloutStrategy{}) {`
`250`	`253`	`in.Spec.Template.Spec.RolloutStrategy = nil`
`251`	`254`	`}`
	`255`	`+ if reflect.DeepEqual(in.Spec.Template.Spec.RolloutAfter, &metav1.Time{}) {`
	`256`	`+ in.Spec.Template.Spec.RolloutAfter = nil`
	`257`	`+ }`
`252`	`258`	`}`
`253`	`259`
`254`	`260`	`func spokeRemediationStrategy(in *RemediationStrategy, c randfill.Continue) {`
`@@ -294,6 +300,9 @@ func spokeBootstrapToken(in *bootstrapv1beta1.BootstrapToken, c randfill.Continu`
`294`	`300`	`if in.TTL != nil {`
`295`	`301`	`in.TTL = ptr.To[metav1.Duration](metav1.Duration{Duration: time.Duration(c.Int31()) * time.Second})`
`296`	`302`	`}`
	`303`	`+ if reflect.DeepEqual(in.Expires, &metav1.Time{}) {`
	`304`	`+ in.Expires = nil`
	`305`	`+ }`
`297`	`306`	`}`
`298`	`307`
`299`	`308`	`var testGVKs = []schema.GroupVersionKind{`
Original file line number	Diff line number	Diff line change
`@@ -531,6 +531,20 @@ func spokeMachineStatus(in *MachineStatus, c randfill.Continue) {`
`531`	`531`	`Kind: "Node",`
`532`	`532`	`}`
`533`	`533`	`}`
	`534`	`+ if reflect.DeepEqual(in.LastUpdated, &metav1.Time{}) {`
	`535`	`+ in.LastUpdated = nil`
	`536`	`+ }`
	`537`	`+ if reflect.DeepEqual(in.CertificatesExpiryDate, &metav1.Time{}) {`
	`538`	`+ in.CertificatesExpiryDate = nil`
	`539`	`+ }`
	`540`	`+ if in.Deletion != nil {`
	`541`	`+ if reflect.DeepEqual(in.Deletion.NodeDrainStartTime, &metav1.Time{}) {`
	`542`	`+ in.Deletion.NodeDrainStartTime = nil`
	`543`	`+ }`
	`544`	`+ if reflect.DeepEqual(in.Deletion.WaitForNodeVolumeDetachStartTime, &metav1.Time{}) {`
	`545`	`+ in.Deletion.WaitForNodeVolumeDetachStartTime = nil`
	`546`	`+ }`
	`547`	`+ }`
`534`	`548`	`}`
`535`	`549`
`536`	`550`	`func MachineSetFuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {`
`@@ -638,6 +652,9 @@ func spokeMachineDeploymentSpec(in *MachineDeploymentSpec, c randfill.Continue)`
`638`	`652`	`in.Strategy = nil`
`639`	`653`	`}`
`640`	`654`	`}`
	`655`	`+ if reflect.DeepEqual(in.RolloutAfter, &metav1.Time{}) {`
	`656`	`+ in.RolloutAfter = nil`
	`657`	`+ }`
`641`	`658`	`}`
`642`	`659`
`643`	`660`	`func spokeMachineDeploymentStatus(in *MachineDeploymentStatus, c randfill.Continue) {`
Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,9 @@ func Convert_v1beta2_BootstrapToken_To_upstreamv1beta3_BootstrapToken(in *bootst`
`243`	`243`	`return err`
`244`	`244`	`}`
`245`	`245`	`out.TTL = clusterv1.ConvertFromSeconds(in.TTLSeconds)`
`246`		`- out.Expires = ptr.To(in.Expires)`
	`246`	`+ if !reflect.DeepEqual(in.Expires, metav1.Time{}) {`
	`247`	`+ out.Expires = ptr.To(in.Expires)`
	`248`	`+ }`
`247`	`249`	`return nil`
`248`	`250`	`}`
`249`	`251`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ limitations under the License.`
`19`	`19`	`package upstreamv1beta3`
`20`	`20`
`21`	`21`	`import (`
	`22`	`+ "reflect"`
`22`	`23`	`"testing"`
`23`	`24`	`"time"`
`24`	`25`
`@@ -170,6 +171,9 @@ func spokeBootstrapToken(in *BootstrapToken, c randfill.Continue) {`
`170`	`171`	`if in.TTL != nil {`
`171`	`172`	`in.TTL = ptr.To[metav1.Duration](metav1.Duration{Duration: time.Duration(c.Int31()) * time.Second})`
`172`	`173`	`}`
	`174`	`+ if reflect.DeepEqual(in.Expires, &metav1.Time{}) {`
	`175`	`+ in.Expires = nil`
	`176`	`+ }`
`173`	`177`	`}`
`174`	`178`
`175`	`179`	`func hubAPIServerFuzzer(obj *bootstrapv1.APIServer, c randfill.Continue) {`