fix review findings

Signed-off-by: sivchari <[email protected]>

Author: sivchari

test/infrastructure/docker/api/v1alpha3/conversion.go

@@ -57,10 +57,9 @@ func (src *DockerCluster) ConvertTo(dstRaw conversion.Hub) error {
 
 	if ok {
 		RestoreDockerClusterSpec(&restored.Spec, &dst.Spec)
+		RestoreDockerClusterStatus(&restored.Status, &dst.Status)
 	}
 
-	RestoreDockerClusterStatus(&restored.Status, &dst.Status)
-
 	return nil
 }
 
@@ -118,10 +117,9 @@ func (src *DockerMachine) ConvertTo(dstRaw conversion.Hub) error {
 
 	if ok {
 		RestoreDockerMachineSpec(&restored.Spec, &dst.Spec)
+		RestoreDockerMachineStatus(&restored.Status, &dst.Status)
 	}
 
-	RestoreDockerMachineStatus(&restored.Status, &dst.Status)
-
 	return nil
 }
 

test/infrastructure/docker/api/v1alpha4/conversion.go

@@ -57,10 +57,9 @@ func (src *DockerCluster) ConvertTo(dstRaw conversion.Hub) error {
 
 	if ok {
 		RestoreDockerClusterSpec(&restored.Spec, &dst.Spec)
+		RestoreDockerClusterStatus(&restored.Status, &dst.Status)
 	}
 
-	RestoreDockerClusterStatus(&restored.Status, &dst.Status)
-
 	return nil
 }
 
@@ -149,10 +148,9 @@ func (src *DockerMachine) ConvertTo(dstRaw conversion.Hub) error {
 
 	if ok {
 		RestoreDockerMachineSpec(&restored.Spec, &dst.Spec)
+		RestoreDockerMachineStatus(&restored.Status, &dst.Status)
 	}
 
-	RestoreDockerMachineStatus(&restored.Status, &dst.Status)
-
 	return nil
 }