Reverted redundant changes to MachineSet and MachineDeploymentSpec co…

…nversion code
kubernetes-sigs · Feb 9, 2020 · fcc777c · fcc777c
1 parent 13c408e
commit fcc777c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 41 deletions.
diff --git a/api/v1alpha2/conversion.go b/api/v1alpha2/conversion.go
@@ -275,7 +275,7 @@ func Convert_v1alpha2_MachineSpec_To_v1alpha3_MachineSpec(in *MachineSpec, out *
 
 	if in.Bootstrap.ConfigRef != nil {
 		gvk := in.Bootstrap.ConfigRef.GetObjectKind().GroupVersionKind()
-		if gvk.Group == bootstrapv1a3.GroupVersion.Group && gvk.Kind == kubeadmConfigKind {
+		if gvk.Group == bootstrapv1a3.GroupVersion.Group && (gvk.Kind == kubeadmConfigKind  || gvk.Kind == kubeadmConfigTemplateKind) {
 			out.Bootstrap.ConfigRef.APIVersion = bootstrapv1a3.GroupVersion.String()
 		}
 	}
@@ -285,36 +285,6 @@ func Convert_v1alpha2_MachineSpec_To_v1alpha3_MachineSpec(in *MachineSpec, out *
 	return nil
 }
 
-func Convert_v1alpha2_MachineSetSpec_To_v1alpha3_MachineSetSpec(in *MachineSetSpec, out *v1alpha3.MachineSetSpec, s apiconversion.Scope) error {
-	if err := autoConvert_v1alpha2_MachineSetSpec_To_v1alpha3_MachineSetSpec(in, out, s); err != nil {
-		return err
-	}
-
-	if in.Template.Spec.Bootstrap.ConfigRef != nil  {
-		gvk := in.Template.Spec.Bootstrap.ConfigRef.GetObjectKind().GroupVersionKind()
-		if gvk.Group == bootstrapv1a3.GroupVersion.Group && gvk.Kind == kubeadmConfigTemplateKind {
-			out.Template.Spec.Bootstrap.ConfigRef.APIVersion = bootstrapv1a3.GroupVersion.String()
-		}
-	}
-
-	return nil
-}
-
-func Convert_v1alpha2_MachineDeploymentSpec_To_v1alpha3_MachineDeploymentSpec(in *MachineDeploymentSpec, out *v1alpha3.MachineDeploymentSpec, s apiconversion.Scope) error {
-	if err := autoConvert_v1alpha2_MachineDeploymentSpec_To_v1alpha3_MachineDeploymentSpec(in, out, s); err != nil {
-		return err
-	}
-
-	if in.Template.Spec.Bootstrap.ConfigRef != nil  {
-		gvk := in.Template.Spec.Bootstrap.ConfigRef.GetObjectKind().GroupVersionKind()
-		if gvk.Group == bootstrapv1a3.GroupVersion.Group && gvk.Kind == kubeadmConfigTemplateKind {
-			out.Template.Spec.Bootstrap.ConfigRef.APIVersion = bootstrapv1a3.GroupVersion.String()
-		}
-	}
-
-	return nil
-}
-
 func Convert_v1alpha2_ClusterSpec_To_v1alpha3_ClusterSpec(in *ClusterSpec, out *v1alpha3.ClusterSpec, s apiconversion.Scope) error {
 	if err := autoConvert_v1alpha2_ClusterSpec_To_v1alpha3_ClusterSpec(in, out, s); err != nil {
 		return err

diff --git a/api/v1alpha2/zz_generated.conversion.go b/api/v1alpha2/zz_generated.conversion.go