Merge pull request #12682 from k8s-infra-cherrypick-robot/cherry-pick-12679-to-release-1.11

[release-1.11] 🐛 Fix KubeadmConfig fuzz test flake

Author: k8s-ci-robot

api/bootstrap/kubeadm/v1beta1/conversion_test.go

@@ -218,6 +218,16 @@ func spokeKubeadmConfigSpec(in *KubeadmConfigSpec, c randfill.Continue) {
 		}
 		in.Users[i] = user
 	}
+
+	if reflect.DeepEqual(in.ClusterConfiguration, &ClusterConfiguration{}) {
+		in.ClusterConfiguration = nil
+	}
+	if reflect.DeepEqual(in.InitConfiguration, &InitConfiguration{}) {
+		in.InitConfiguration = nil
+	}
+	if reflect.DeepEqual(in.JoinConfiguration, &JoinConfiguration{}) {
+		in.JoinConfiguration = nil
+	}
 }
 
 func spokeClusterConfiguration(in *ClusterConfiguration, c randfill.Continue) {

api/controlplane/kubeadm/v1beta1/conversion_test.go

@@ -345,6 +345,16 @@ func spokeKubeadmConfigSpec(in *bootstrapv1beta1.KubeadmConfigSpec, c randfill.C
 		}
 		in.Users[i] = user
 	}
+
+	if reflect.DeepEqual(in.ClusterConfiguration, &bootstrapv1beta1.ClusterConfiguration{}) {
+		in.ClusterConfiguration = nil
+	}
+	if reflect.DeepEqual(in.InitConfiguration, &bootstrapv1beta1.InitConfiguration{}) {
+		in.InitConfiguration = nil
+	}
+	if reflect.DeepEqual(in.JoinConfiguration, &bootstrapv1beta1.JoinConfiguration{}) {
+		in.JoinConfiguration = nil
+	}
 }
 
 func spokeClusterConfiguration(in *bootstrapv1beta1.ClusterConfiguration, c randfill.Continue) {

internal/api/bootstrap/kubeadm/v1alpha3/conversion_test.go

@@ -190,6 +190,16 @@ func spokeKubeadmConfigSpec(in *KubeadmConfigSpec, c randfill.Continue) {
 		}
 		in.Files[i] = file
 	}
+
+	if reflect.DeepEqual(in.ClusterConfiguration, &ClusterConfiguration{}) {
+		in.ClusterConfiguration = nil
+	}
+	if reflect.DeepEqual(in.InitConfiguration, &InitConfiguration{}) {
+		in.InitConfiguration = nil
+	}
+	if reflect.DeepEqual(in.JoinConfiguration, &JoinConfiguration{}) {
+		in.JoinConfiguration = nil
+	}
 }
 
 func spokeKubeadmConfigStatus(obj *KubeadmConfigStatus, c randfill.Continue) {

internal/api/bootstrap/kubeadm/v1alpha4/conversion_test.go

@@ -188,6 +188,16 @@ func spokeKubeadmConfigSpec(in *KubeadmConfigSpec, c randfill.Continue) {
 		}
 		in.Files[i] = file
 	}
+
+	if reflect.DeepEqual(in.ClusterConfiguration, &ClusterConfiguration{}) {
+		in.ClusterConfiguration = nil
+	}
+	if reflect.DeepEqual(in.InitConfiguration, &InitConfiguration{}) {
+		in.InitConfiguration = nil
+	}
+	if reflect.DeepEqual(in.JoinConfiguration, &JoinConfiguration{}) {
+		in.JoinConfiguration = nil
+	}
 }
 
 func spokeKubeadmConfigStatus(obj *KubeadmConfigStatus, c randfill.Continue) {

internal/api/controlplane/kubeadm/v1alpha3/conversion_test.go

@@ -277,6 +277,16 @@ func spokeKubeadmConfigSpec(in *bootstrapv1alpha3.KubeadmConfigSpec, c randfill.
 		}
 		in.Files[i] = file
 	}
+
+	if reflect.DeepEqual(in.ClusterConfiguration, &bootstrapv1alpha3.ClusterConfiguration{}) {
+		in.ClusterConfiguration = nil
+	}
+	if reflect.DeepEqual(in.InitConfiguration, &bootstrapv1alpha3.InitConfiguration{}) {
+		in.InitConfiguration = nil
+	}
+	if reflect.DeepEqual(in.JoinConfiguration, &bootstrapv1alpha3.JoinConfiguration{}) {
+		in.JoinConfiguration = nil
+	}
 }
 
 func spokeAPIServer(in *bootstrapv1alpha3.APIServer, c randfill.Continue) {

internal/api/controlplane/kubeadm/v1alpha4/conversion_test.go

@@ -302,6 +302,16 @@ func spokeKubeadmConfigSpec(in *bootstrapv1alpha4.KubeadmConfigSpec, c randfill.
 		}
 		in.Files[i] = file
 	}
+
+	if reflect.DeepEqual(in.ClusterConfiguration, &bootstrapv1alpha4.ClusterConfiguration{}) {
+		in.ClusterConfiguration = nil
+	}
+	if reflect.DeepEqual(in.InitConfiguration, &bootstrapv1alpha4.InitConfiguration{}) {
+		in.InitConfiguration = nil
+	}
+	if reflect.DeepEqual(in.JoinConfiguration, &bootstrapv1alpha4.JoinConfiguration{}) {
+		in.JoinConfiguration = nil
+	}
 }
 
 func spokeClusterConfiguration(in *bootstrapv1alpha4.ClusterConfiguration, c randfill.Continue) {