[Ensemble] Updates for review comments

neeleshkorade · neeleshkorade · commit 8ff0ec776f28 · 2019-12-27T14:24:43.000-08:00
diff --git a/api/v1alpha2/conversion.go b/api/v1alpha2/conversion.go
@@ -191,7 +191,7 @@ func Convert_v1alpha2_MachineSetSpec_To_v1alpha3_MachineSetSpec(in *MachineSetSp
 	}
 
 	if inGV.Group == bootstrapv1a3.GroupVersion.Group && (out.Template.Spec.Bootstrap.ConfigRef.Kind == kubeadmConfigKind || out.Template.Spec.Bootstrap.ConfigRef.Kind == kubeadmConfigTemplateKind) {
-		out.Template.Spec.Bootstrap.ConfigRef.APIVersion = in.Template.Spec.Bootstrap.ConfigRef.GroupVersionKind().Group + "/" + "v1alpha3"
+		out.Template.Spec.Bootstrap.ConfigRef.APIVersion = bootstrapv1a3.GroupVersion.String()
 	}
 
 	return nil
@@ -208,7 +208,7 @@ func Convert_v1alpha2_MachineDeploymentSpec_To_v1alpha3_MachineDeploymentSpec(in
 	}
 
 	if inGV.Group == bootstrapv1a3.GroupVersion.Group && (out.Template.Spec.Bootstrap.ConfigRef.Kind == kubeadmConfigKind || out.Template.Spec.Bootstrap.ConfigRef.Kind == kubeadmConfigTemplateKind) {
-		out.Template.Spec.Bootstrap.ConfigRef.APIVersion = in.Template.Spec.Bootstrap.ConfigRef.GroupVersionKind().Group + "/" + "v1alpha3"
+		out.Template.Spec.Bootstrap.ConfigRef.APIVersion = bootstrapv1a3.GroupVersion.String()
 	}
 
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ func Convert_v1alpha2_MachineSetSpec_To_v1alpha3_MachineSetSpec(in *MachineSetSp`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`if inGV.Group == bootstrapv1a3.GroupVersion.Group && (out.Template.Spec.Bootstrap.ConfigRef.Kind == kubeadmConfigKind \|\| out.Template.Spec.Bootstrap.ConfigRef.Kind == kubeadmConfigTemplateKind) {`
`194`		`- out.Template.Spec.Bootstrap.ConfigRef.APIVersion = in.Template.Spec.Bootstrap.ConfigRef.GroupVersionKind().Group + "/" + "v1alpha3"`
	`194`	`+ out.Template.Spec.Bootstrap.ConfigRef.APIVersion = bootstrapv1a3.GroupVersion.String()`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`return nil`
`@@ -208,7 +208,7 @@ func Convert_v1alpha2_MachineDeploymentSpec_To_v1alpha3_MachineDeploymentSpec(in`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`if inGV.Group == bootstrapv1a3.GroupVersion.Group && (out.Template.Spec.Bootstrap.ConfigRef.Kind == kubeadmConfigKind \|\| out.Template.Spec.Bootstrap.ConfigRef.Kind == kubeadmConfigTemplateKind) {`
`211`		`- out.Template.Spec.Bootstrap.ConfigRef.APIVersion = in.Template.Spec.Bootstrap.ConfigRef.GroupVersionKind().Group + "/" + "v1alpha3"`
	`211`	`+ out.Template.Spec.Bootstrap.ConfigRef.APIVersion = bootstrapv1a3.GroupVersion.String()`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`return nil`