Only try to convert infraRefs if they are set

Signed-off-by: Stefan Büringer [email protected]

Author: sbueringer

api/controlplane/kubeadm/v1beta1/conversion.go

@@ -95,11 +95,13 @@ func (dst *KubeadmControlPlane) ConvertFrom(srcRaw conversion.Hub) error {
 		return err
 	}
 
-	infraRef, err := convertToObjectReference(&src.Spec.MachineTemplate.Spec.InfrastructureRef, src.Namespace)
-	if err != nil {
-		return err
+	if src.Spec.MachineTemplate.Spec.InfrastructureRef.IsDefined() {
+		infraRef, err := convertToObjectReference(&src.Spec.MachineTemplate.Spec.InfrastructureRef, src.Namespace)
+		if err != nil {
+			return err
+		}
+		dst.Spec.MachineTemplate.InfrastructureRef = *infraRef
 	}
-	dst.Spec.MachineTemplate.InfrastructureRef = *infraRef
 
 	// Convert timeouts moved from one struct to another.
 	dst.Spec.KubeadmConfigSpec.ConvertFrom(&src.Spec.KubeadmConfigSpec)

api/core/v1beta1/conversion.go

@@ -2233,11 +2233,13 @@ func convertMachineSpecToContractVersionedObjectReference(src *MachineSpec, dst
 }
 
 func convertMachineSpecToObjectReference(src *clusterv1.MachineSpec, dst *MachineSpec, namespace string) error {
-	infraRef, err := convertToObjectReference(src.InfrastructureRef, namespace)
-	if err != nil {
-		return err
+	if src.InfrastructureRef.IsDefined() {
+		infraRef, err := convertToObjectReference(src.InfrastructureRef, namespace)
+		if err != nil {
+			return err
+		}
+		dst.InfrastructureRef = *infraRef
 	}
-	dst.InfrastructureRef = *infraRef
 
 	if src.Bootstrap.ConfigRef.IsDefined() {
 		bootstrapRef, err := convertToObjectReference(src.Bootstrap.ConfigRef, namespace)

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

@@ -125,11 +125,13 @@ func (dst *KubeadmControlPlane) ConvertFrom(srcRaw conversion.Hub) error {
 		return err
 	}
 
-	infraRef, err := convertToObjectReference(&src.Spec.MachineTemplate.Spec.InfrastructureRef, src.Namespace)
-	if err != nil {
-		return err
+	if src.Spec.MachineTemplate.Spec.InfrastructureRef.IsDefined() {
+		infraRef, err := convertToObjectReference(&src.Spec.MachineTemplate.Spec.InfrastructureRef, src.Namespace)
+		if err != nil {
+			return err
+		}
+		dst.Spec.InfrastructureTemplate = *infraRef
 	}
-	dst.Spec.InfrastructureTemplate = *infraRef
 
 	// Reset conditions from autogenerated conversions
 	// NOTE: v1beta2 conditions should not be automatically be converted into legacy conditions (v1alpha3).

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

@@ -122,11 +122,13 @@ func (dst *KubeadmControlPlane) ConvertFrom(srcRaw conversion.Hub) error {
 		return err
 	}
 
-	infraRef, err := convertToObjectReference(&src.Spec.MachineTemplate.Spec.InfrastructureRef, src.Namespace)
-	if err != nil {
-		return err
+	if src.Spec.MachineTemplate.Spec.InfrastructureRef.IsDefined() {
+		infraRef, err := convertToObjectReference(&src.Spec.MachineTemplate.Spec.InfrastructureRef, src.Namespace)
+		if err != nil {
+			return err
+		}
+		dst.Spec.MachineTemplate.InfrastructureRef = *infraRef
 	}
-	dst.Spec.MachineTemplate.InfrastructureRef = *infraRef
 
 	// Reset conditions from autogenerated conversions
 	// NOTE: v1beta2 conditions should not be automatically be converted into legacy conditions (v1alpha4).

internal/api/core/v1alpha3/conversion.go

@@ -1066,11 +1066,13 @@ func convertMachineSpecToContractVersionedObjectReference(src *MachineSpec, dst
 }
 
 func convertMachineSpecToObjectReference(src *clusterv1.MachineSpec, dst *MachineSpec, namespace string) error {
-	infraRef, err := convertToObjectReference(src.InfrastructureRef, namespace)
-	if err != nil {
-		return err
+	if src.InfrastructureRef.IsDefined() {
+		infraRef, err := convertToObjectReference(src.InfrastructureRef, namespace)
+		if err != nil {
+			return err
+		}
+		dst.InfrastructureRef = *infraRef
 	}
-	dst.InfrastructureRef = *infraRef
 
 	if src.Bootstrap.ConfigRef.IsDefined() {
 		bootstrapRef, err := convertToObjectReference(src.Bootstrap.ConfigRef, namespace)

internal/api/core/v1alpha4/conversion.go

@@ -1352,11 +1352,13 @@ func convertMachineSpecToContractVersionedObjectReference(src *MachineSpec, dst
 }
 
 func convertMachineSpecToObjectReference(src *clusterv1.MachineSpec, dst *MachineSpec, namespace string) error {
-	infraRef, err := convertToObjectReference(src.InfrastructureRef, namespace)
-	if err != nil {
-		return err
+	if src.InfrastructureRef.IsDefined() {
+		infraRef, err := convertToObjectReference(src.InfrastructureRef, namespace)
+		if err != nil {
+			return err
+		}
+		dst.InfrastructureRef = *infraRef
 	}
-	dst.InfrastructureRef = *infraRef
 
 	if src.Bootstrap.ConfigRef.IsDefined() {
 		bootstrapRef, err := convertToObjectReference(src.Bootstrap.ConfigRef, namespace)